ci: Fix setting/passing `TELEMETRY_*` environment variables

4 files changed, 11 insertions, 17 deletions

diff --git a/.github/workflows/autogpt-ci.yml b/.github/workflows/autogpt-ci.yml
index a66e15a31..03f0987ba 100644
--- a/.github/workflows/autogpt-ci.yml
+++ b/.github/workflows/autogpt-ci.yml
@@ -22,10 +22,6 @@ defaults:
   run:
     working-directory: autogpts/autogpt
 
-env:
-  TELEMETRY_ENVIRONMENT: autogpt-ci
-  TELEMETRY_OPT_IN: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
-
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -169,6 +165,8 @@ jobs:
           CI: true
           PLAIN_OUTPUT: True
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          TELEMETRY_ENVIRONMENT: autogpt-ci
+          TELEMETRY_OPT_IN: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
           S3_ENDPOINT_URL: http://localhost:9000
           AWS_ACCESS_KEY_ID: minioadmin
           AWS_SECRET_ACCESS_KEY: minioadmin
diff --git a/.github/workflows/autogpts-benchmark.yml b/.github/workflows/autogpts-benchmark.yml
index 5607246a5..93d43ff23 100644
--- a/.github/workflows/autogpts-benchmark.yml
+++ b/.github/workflows/autogpts-benchmark.yml
@@ -5,10 +5,6 @@ on:
   schedule:
     - cron: '0 2 * * *'
 
-env:
-  TELEMETRY_ENVIRONMENT: autogpt-benchmark-ci
-  TELEMETRY_OPT_IN: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
-
 jobs:
   benchmark:
     permissions:
@@ -65,6 +61,9 @@ jobs:
           REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt
           REPORTS_FOLDER: ${{ format('../../{0}', env.REPORTS_FOLDER) }}  # account for changed workdir
 
+          TELEMETRY_ENVIRONMENT: autogpt-benchmark-ci
+          TELEMETRY_OPT_IN: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
+
       - name: Push reports to data branch
         run: |
           git config --global user.name 'GitHub Actions'
diff --git a/.github/workflows/autogpts-ci.yml b/.github/workflows/autogpts-ci.yml
index 15cb1ea69..70c816237 100644
--- a/.github/workflows/autogpts-ci.yml
+++ b/.github/workflows/autogpts-ci.yml
@@ -25,10 +25,6 @@ on:
       - 'setup.py'
       - '!**/*.md'
 
-env:
-  TELEMETRY_ENVIRONMENT: autogpt-ci
-  TELEMETRY_OPT_IN: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
-
 jobs:
   run-tests:
     runs-on: ubuntu-latest
@@ -69,3 +65,5 @@ jobs:
           HELICONE_CACHE_ENABLED: false
           HELICONE_PROPERTY_AGENT: ${{ matrix.agent-name }}
           REPORTS_FOLDER: ${{ format('../../reports/{0}', matrix.agent-name) }}
+          TELEMETRY_ENVIRONMENT: autogpt-ci
+          TELEMETRY_OPT_IN: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
diff --git a/.github/workflows/benchmark-ci.yml b/.github/workflows/benchmark-ci.yml
index d381371dd..f854a5a26 100644
--- a/.github/workflows/benchmark-ci.yml
+++ b/.github/workflows/benchmark-ci.yml
@@ -16,8 +16,6 @@ on:
 
 env:
   min-python-version: '3.10'
-  TELEMETRY_ENVIRONMENT: autogpt-benchmark-ci
-  TELEMETRY_OPT_IN: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
 
 jobs:
   lint:
@@ -98,11 +96,10 @@ jobs:
       - name: Run regression tests
         run: |
           ./run agent start ${{ matrix.agent-name }}
-          sleep 10
           cd autogpts/${{ matrix.agent-name }}
+
           set +e # Ignore non-zero exit codes and continue execution
           echo "Running the following command: poetry run agbenchmark --maintain --mock"
-
           poetry run agbenchmark --maintain --mock
           EXIT_CODE=$?
           set -e  # Stop ignoring non-zero exit codes
@@ -129,7 +126,7 @@ jobs:
 
           poetry run agbenchmark --mock
           poetry run pytest -vv -s tests
-          
+
           CHANGED=$(git diff --name-only | grep -E '(agbenchmark/challenges)|(../frontend/assets)') || echo "No diffs"
           if [ ! -z "$CHANGED" ]; then
             echo "There are unstaged changes please run agbenchmark and commit those changes since they are needed."
@@ -140,3 +137,5 @@ jobs:
           fi
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          TELEMETRY_ENVIRONMENT: autogpt-benchmark-ci
+          TELEMETRY_OPT_IN: ${{ github.event_name == 'push' && github.ref_name == 'master' }}