SALT_REPO_DOMAIN is defined in vars not env

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

.github/workflows/release.yml

@@ -157,6 +157,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       skip-code-coverage: true
+      salt-repo-domain: ${{ vars.SALT_REPO_DOMAIN || 'repo.saltproject.io' }}
 
   test-macos-pkg-downloads:
     name: Test macOS Package Downloads
@@ -171,6 +172,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       skip-code-coverage: true
+      salt-repo-domain: ${{ vars.SALT_REPO_DOMAIN || 'repo.saltproject.io' }}
 
   test-windows-pkg-downloads:
     name: Test Windows Package Downloads
@@ -185,6 +187,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       skip-code-coverage: true
+      salt-repo-domain: ${{ vars.SALT_REPO_DOMAIN || 'repo.saltproject.io' }}
 
   release:
     name: Release v${{ needs.prepare-workflow.outputs.salt-version }}

.github/workflows/staging.yml

@@ -1939,6 +1939,10 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: staging
       skip-code-coverage: true
+      salt-repo-domain: ${{ vars.SALT_REPO_DOMAIN || 'staging.repo.saltproject.io' }}
+    secrets:
+      salt-repo-username: ${{ secrets.SALT_REPO_USER }}
+      salt-repo-password: ${{ secrets.SALT_REPO_PASS }}
 
   test-macos-pkg-downloads:
     name: Test macOS Package Downloads
@@ -1953,6 +1957,10 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: staging
       skip-code-coverage: true
+      salt-repo-domain: ${{ vars.SALT_REPO_DOMAIN || 'staging.repo.saltproject.io' }}
+    secrets:
+      salt-repo-username: ${{ secrets.SALT_REPO_USER }}
+      salt-repo-password: ${{ secrets.SALT_REPO_PASS }}
 
   test-windows-pkg-downloads:
     name: Test Windows Package Downloads
@@ -1967,6 +1975,10 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: staging
       skip-code-coverage: true
+      salt-repo-domain: ${{ vars.SALT_REPO_DOMAIN || 'staging.repo.saltproject.io' }}
+    secrets:
+      salt-repo-username: ${{ secrets.SALT_REPO_USER }}
+      salt-repo-password: ${{ secrets.SALT_REPO_PASS }}
 
   publish-pypi:
     name: Publish to PyPi(test)

.github/workflows/templates/test-pkg-repo-downloads.yml.jinja

@@ -14,6 +14,12 @@
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: <{ gh_environment }>
       skip-code-coverage: true
+      salt-repo-domain: ${{ vars.SALT_REPO_DOMAIN || '<% if gh_environment == 'staging' -%> staging. <%- endif -%> repo.saltproject.io' }}
+    <%- if gh_environment == 'staging' %>
+    secrets:
+      salt-repo-username: ${{ secrets.SALT_REPO_USER }}
+      salt-repo-password: ${{ secrets.SALT_REPO_PASS }}
+    <%- endif %>
 
 
   <%- set job_name = "test-macos-pkg-downloads" %>
@@ -32,6 +38,12 @@
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: <{ gh_environment }>
       skip-code-coverage: true
+      salt-repo-domain: ${{ vars.SALT_REPO_DOMAIN || '<% if gh_environment == 'staging' -%> staging. <%- endif -%> repo.saltproject.io' }}
+    <%- if gh_environment == 'staging' %>
+    secrets:
+      salt-repo-username: ${{ secrets.SALT_REPO_USER }}
+      salt-repo-password: ${{ secrets.SALT_REPO_PASS }}
+    <%- endif %>
 
 
   <%- set job_name = "test-windows-pkg-downloads" %>
@@ -50,3 +62,9 @@
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: <{ gh_environment }>
       skip-code-coverage: true
+      salt-repo-domain: ${{ vars.SALT_REPO_DOMAIN || '<% if gh_environment == 'staging' -%> staging. <%- endif -%> repo.saltproject.io' }}
+    <%- if gh_environment == 'staging' %>
+    secrets:
+      salt-repo-username: ${{ secrets.SALT_REPO_USER }}
+      salt-repo-password: ${{ secrets.SALT_REPO_PASS }}
+    <%- endif %>

.github/workflows/test-package-downloads-action-linux.yml

@@ -43,6 +43,17 @@ on:
         type: string
         description: The nox session to run
         default: test-pkgs-onedir
+      salt-repo-domain:
+        required: false
+        type: string
+        description: The domain of the package repository
+    secrets:
+      salt-repo-username:
+        required: false
+        description: Username to access the package repository
+      salt-repo-password:
+        required: false
+        description: Password to access the package repository
 
 
 env:
@@ -135,12 +146,19 @@ jobs:
         run: |
           nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }}
 
+      - name: Upload Nox Requirements Tarball
+        uses: actions/upload-artifact@v3
+        with:
+          name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
+          path: nox.${{ inputs.distro-slug }}.tar.*
+
   test:
     name: Test
     runs-on:
       - self-hosted
       - linux
       - ${{ matrix.arch }}
+    environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     needs:
       - dependencies
@@ -205,7 +223,9 @@ jobs:
           SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
           SALT_RELEASE: "${{ inputs.salt-version }}"
           SALT_REPO_TYPE: ${{ inputs.environment }}
-          SALT_REPO_DOMAIN: ${{ env.SALT_REPO_DOMAIN || 'staging.repo.saltproject.io' }}
+          SALT_REPO_USER: ${{ secrets.salt-repo-username }}
+          SALT_REPO_PASS: ${{ secrets.salt-repo-password }}
+          SALT_REPO_DOMAIN: ${{ inputs.salt-repo-domain }}
         run: |
           nox --force-color -e ${{ inputs.nox-session }} -- download-pkgs
 

.github/workflows/test-package-downloads-action-macos.yml

@@ -43,6 +43,17 @@ on:
         type: string
         description: The nox session to run
         default: test-pkgs-onedir
+      salt-repo-domain:
+        required: false
+        type: string
+        description: The domain of the package repository
+    secrets:
+      salt-repo-username:
+        required: false
+        description: Username to access the package repository
+      salt-repo-password:
+        required: false
+        description: Password to access the package repository
 
 
 env:
@@ -148,6 +159,12 @@ jobs:
         run: |
           nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }}
 
+      - name: Upload Nox Requirements Tarball
+        uses: actions/upload-artifact@v3
+        with:
+          name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
+          path: nox.${{ inputs.distro-slug }}.tar.*
+
   test:
     name: Test
     runs-on: ${{ inputs.distro-slug }}
@@ -225,7 +242,9 @@ jobs:
           SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
           SALT_RELEASE: "${{ inputs.salt-version }}"
           SALT_REPO_TYPE: ${{ inputs.environment }}
-          SALT_REPO_DOMAIN: ${{ env.SALT_REPO_DOMAIN || 'staging.repo.saltproject.io' }}
+          SALT_REPO_USER: ${{ secrets.salt-repo-username }}
+          SALT_REPO_PASS: ${{ secrets.salt-repo-password }}
+          SALT_REPO_DOMAIN: ${{ inputs.salt-repo-domain }}}
         run: |
           sudo -E nox --force-color -e ${{ inputs.nox-session }} -- download-pkgs
 
@@ -260,6 +279,7 @@ jobs:
   report:
     name: Reports for ${{ inputs.distro-slug }}(${{ matrix.arch }})
     runs-on: ubuntu-latest
+    environment: ${{ inputs.environment }}
     if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
     needs:
       - test

.github/workflows/test-package-downloads-action-windows.yml

@@ -43,6 +43,17 @@ on:
         type: string
         description: The nox session to run
         default: test-pkgs-onedir
+      salt-repo-domain:
+        required: false
+        type: string
+        description: The domain of the package repository
+    secrets:
+      salt-repo-username:
+        required: false
+        description: Username to access the package repository
+      salt-repo-password:
+        required: false
+        description: Password to access the package repository
 
 
 env:
@@ -92,7 +103,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json') }}
+          key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ matrix.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json') }}
 
       - name: Download Onedir Tarball as an Artifact
         if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
@@ -139,9 +150,16 @@ jobs:
         run: |
           nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }}
 
+      - name: Upload Nox Requirements Tarball
+        uses: actions/upload-artifact@v3
+        with:
+          name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
+          path: nox.${{ inputs.distro-slug }}.tar.*
+
   test:
     name: Test
     runs-on: ${{ inputs.distro-slug }}
+    environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     needs:
       - dependencies
@@ -182,7 +200,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json') }}
+          key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ matrix.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json') }}
 
       - name: Decompress .nox Directory
         run: |
@@ -214,7 +232,9 @@ jobs:
           INSTALL_TYPE: ${{ matrix.install_type }}
           SALT_RELEASE: "${{ inputs.salt-version }}"
           SALT_REPO_TYPE: ${{ inputs.environment }}
-          SALT_REPO_DOMAIN: ${{ env.SALT_REPO_DOMAIN || 'staging.repo.saltproject.io' }}
+          SALT_REPO_USER: ${{ secrets.salt-repo-username }}
+          SALT_REPO_PASS: ${{ secrets.salt-repo-password }}
+          SALT_REPO_DOMAIN: ${{ inputs.salt-repo-domain }}
         run: |
           nox --force-color -e ${{ inputs.nox-session }} -- download-pkgs