fix: refactor vars

ansible · Aug 27, 2024 · 9cbcd45 · 9cbcd45
1 parent c5d9dbb
commit 9cbcd45
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/.github/actions/all-tests/action.yml b/.github/actions/all-tests/action.yml
@@ -10,6 +10,10 @@ runs:
         echo "GIT_SHA=$(git rev-parse "$GITHUB_SHA")" >> "$GITHUB_ENV"
 
     - name: Common tests
+      env:
+        TEST_RESULTS_AGGREGATOR_USERNAME: ${{ env.TEST_RESULTS_AGGREGATOR_USERNAME }}
+        TEST_RESULTS_AGGREGATOR_PASSWORD: ${{ env.TEST_RESULTS_AGGREGATOR_PASSWORD }}
+        TEST_RESULTS_AGGREGATOR_URL: ${{ env.TEST_RESULTS_AGGREGATOR_URL }}
       uses: ./.github/actions/common-tests
 
     - name: Long-running tests
@@ -20,12 +24,16 @@ runs:
       shell: bash
       run: >-
         http --check-status --ignore-stdin
-        --auth "${{ vars.TEST_RESULTS_AGGREGATOR_USERNAME }}:${{ secrets.TEST_RESULTS_AGGREGATOR_PASSWORD }}"
-        -f POST "${{ vars.TEST_RESULTS_AGGREGATOR_URL }}/api/results/upload/"
+        --auth "${{ env.TEST_RESULTS_AGGREGATOR_USERNAME }}:${{ env.TEST_RESULTS_AGGREGATOR_PASSWORD }}"
+        -f POST "${{ env.TEST_RESULTS_AGGREGATOR_URL }}/api/results/upload/"
         [email protected]
         component_name=eda
         git_commit_sha=${{ env.GIT_SHA }}
         git_repository_url="https://github.com/${{ github.repository }}"
 
     - name: e2e tests
+      env:
+        TEST_RESULTS_AGGREGATOR_USERNAME: ${{ env.TEST_RESULTS_AGGREGATOR_USERNAME }}
+        TEST_RESULTS_AGGREGATOR_PASSWORD: ${{ env.TEST_RESULTS_AGGREGATOR_PASSWORD }}
+        TEST_RESULTS_AGGREGATOR_URL: ${{ env.TEST_RESULTS_AGGREGATOR_URL }}
       uses: ./.github/actions/e2e-tests
diff --git a/.github/actions/common-tests/action.yml b/.github/actions/common-tests/action.yml
@@ -17,8 +17,8 @@ runs:
       shell: bash
       run: >-
         http --check-status --ignore-stdin
-        --auth "${{ vars.TEST_RESULTS_AGGREGATOR_USERNAME }}:${{ secrets.TEST_RESULTS_AGGREGATOR_PASSWORD }}"
-        -f POST "${{ vars.TEST_RESULTS_AGGREGATOR_URL }}/api/results/upload/"
+        --auth "${{ env.TEST_RESULTS_AGGREGATOR_USERNAME }}:${{ env.TEST_RESULTS_AGGREGATOR_PASSWORD }}"
+        -f POST "${{ env.TEST_RESULTS_AGGREGATOR_URL }}/api/results/upload/"
         [email protected]
         component_name=eda
         git_commit_sha=${{ env.GIT_SHA }}

diff --git a/.github/actions/e2e-tests/action.yml b/.github/actions/e2e-tests/action.yml
@@ -17,8 +17,8 @@ runs:
       shell: bash
       run: >-
         http --check-status --ignore-stdin
-        --auth "${{ vars.TEST_RESULTS_AGGREGATOR_USERNAME }}:${{ secrets.TEST_RESULTS_AGGREGATOR_PASSWORD }}"
-        -f POST "${{ vars.TEST_RESULTS_AGGREGATOR_URL }}/api/results/upload/"
+        --auth "${{ env.TEST_RESULTS_AGGREGATOR_USERNAME }}:${{ env.TEST_RESULTS_AGGREGATOR_PASSWORD }}"
+        -f POST "${{ env.TEST_RESULTS_AGGREGATOR_URL }}/api/results/upload/"
         [email protected]
         component_name=eda
         git_commit_sha=${{ env.GIT_SHA }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -68,6 +68,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: All tests
+        env:
+          TEST_RESULTS_AGGREGATOR_USERNAME: ${{ vars.TEST_RESULTS_AGGREGATOR_USERNAME }}
+          TEST_RESULTS_AGGREGATOR_PASSWORD: ${{ secrets.TEST_RESULTS_AGGREGATOR_PASSWORD }}
+          TEST_RESULTS_AGGREGATOR_URL: ${{ vars.TEST_RESULTS_AGGREGATOR_URL }}
         uses: ./.github/actions/all-tests
 
       - name: Upload coverage to Codecov