From 176ec46f2b4194feec4c538ca70dd692665e2477 Mon Sep 17 00:00:00 2001 From: Tarun Menon Date: Fri, 12 Jul 2024 11:44:26 +1000 Subject: [PATCH] update --- .github/workflows/locust-distributed.yaml | 21 +-------------------- locust-distributed/docker-entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/.github/workflows/locust-distributed.yaml b/.github/workflows/locust-distributed.yaml index 7ade55d..a7e3e9f 100644 --- a/.github/workflows/locust-distributed.yaml +++ b/.github/workflows/locust-distributed.yaml @@ -9,29 +9,10 @@ on: - 'locust-distributed/**' - .github/workflows/locust-distributed.yaml - -env: - IMAGE_NAME: locust - jobs: build-and-publish-latest: runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v2 - - # - name: Build image - # run: docker build --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" locust/ - - # - name: Log into registry - # run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - # - name: Push image - # run: | - # IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME - # IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - # docker tag $IMAGE_NAME $IMAGE_ID:latest - # docker push $IMAGE_ID:latest - steps: - name: Check out the repo uses: actions/checkout@v3 @@ -54,4 +35,4 @@ jobs: with: context: ./locust push: true - tags: ghcr.io/base2services/locust-distributed:snapshot_${{env.GITHUB_SHA_SHORT}} \ No newline at end of file + tags: ghcr.io/base2services/locust-distributed:snapshot_${{env.GITHUB_REF_SLUG}} \ No newline at end of file diff --git a/locust-distributed/docker-entrypoint.sh b/locust-distributed/docker-entrypoint.sh index 8413051..9cd3d5c 100755 --- a/locust-distributed/docker-entrypoint.sh +++ b/locust-distributed/docker-entrypoint.sh @@ -25,7 +25,7 @@ case `echo ${LOCUST_MODE} | tr 'a-z' 'A-Z'` in "SLAVE") LOCUST_OPTS="--worker --master-host=${LOCUST_MASTER} --master-port=${LOCUST_MASTER_BIND_PORT} $LOCUST_OPTS" - echo "${LOCUST_OPTS}" + echo "Options: ${LOCUST_OPTS}" if [ -z ${LOCUST_MASTER+x} ] ; then echo "You need to set LOCUST_MASTER." exit 1