From d3728d1ad64097e1d4fb787532a2592b30541fb7 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 3 Dec 2024 16:14:51 -0700 Subject: [PATCH] Fix windows mac test matrix --- .github/workflows/staging.yml | 6 ------ .github/workflows/templates/staging.yml.jinja | 3 ++- .github/workflows/test-action.yml | 6 +++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index c2b982f0baf..e2b6859df9e 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -571,12 +571,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts with: diff --git a/.github/workflows/templates/staging.yml.jinja b/.github/workflows/templates/staging.yml.jinja index 7ad3a8ce3d4..c6e71814d94 100644 --- a/.github/workflows/templates/staging.yml.jinja +++ b/.github/workflows/templates/staging.yml.jinja @@ -91,12 +91,13 @@ concurrency: - ubuntu-latest steps: - uses: actions/checkout@v4 - + {#- - name: Get Salt Project GitHub Actions Bot Environment run: | TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + #} - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 98944649e1d..07bdad2c5cf 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -68,7 +68,7 @@ jobs: test-linux: name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }} runs-on: - - ${{ matrix.arch == 'x86_64' && 'ubuntu-24.04' || 'linux-arm64' }} + - ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }} container: image: ${{ matrix.container }} # Full test runs. Each chunk should never take more than 2 hours. @@ -320,7 +320,7 @@ jobs: strategy: fail-fast: false matrix: - include: ${{ fromJSON(inputs.matrix)['linux'] }} + include: ${{ fromJSON(inputs.matrix)['macos'] }} env: SALT_TRANSPORT: ${{ matrix.transport }} @@ -553,7 +553,7 @@ jobs: strategy: fail-fast: false matrix: - include: ${{ fromJSON(inputs.matrix)['linux'] }} + include: ${{ fromJSON(inputs.matrix)['windows'] }} env: SALT_TRANSPORT: ${{ matrix.transport }}