Skip to content

Commit 952553a

Browse files
dmurphy18dmurphy18
authored
Merge branch '3006.x' into fix_67044
2 parents 1534b1a + 9e82700 commit 952553a

File tree

5 files changed

+197
-31
lines changed

5 files changed

+197
-31
lines changed

‎.github/workflows/build-packages.yml

-2
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ jobs:
149149
strategy:
150150
fail-fast: false
151151
matrix:
152-
source:
153-
- ${{ inputs.source }}
154152
include: ${{ fromJSON(inputs.matrix)['linux'] }}
155153

156154
container:

‎.github/workflows/draft-release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ jobs:
8585
with:
8686
name: salt-${{ inputs.salt-version }}-${{ matrix.arch }}-deb
8787
upload_url: ${{ needs.create-github-release.outputs.upload_url }}
88+
pattern: "*.deb"
8889

8990
upload-rpm-packages:
9091
needs:

‎.github/workflows/release-artifact.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ on:
1212
type: string
1313
required: true
1414
description: Release's upload url.
15+
pattern:
16+
type: string
17+
required: false
18+
description: Pattern of files to upload
1519

1620

1721
jobs:
@@ -29,7 +33,11 @@ jobs:
2933
- run: find artifacts -maxdepth 1 -type f -printf '%f\n'
3034
- id: list-files
3135
run: |
32-
echo files="$(find artifacts -maxdepth 1 -type f -printf '%f\n' | jq -Rnc '[inputs | { file: "\(.)" }]')" >> "$GITHUB_OUTPUT"
36+
if [ "${{ inputs.pattern }}" != "" ]; then
37+
echo files="$(find artifacts -maxdepth 1 -type f -name '${{ inputs.pattern }}' -printf '%f\n' | jq -Rnc '[inputs | { file: "\(.)" }]')" >> "$GITHUB_OUTPUT"
38+
else
39+
echo files="$(find artifacts -maxdepth 1 -type f -printf '%f\n' | jq -Rnc '[inputs | { file: "\(.)" }]')" >> "$GITHUB_OUTPUT"
40+
fi
3341
3442
upload-files:
3543
name: Upload ${{ matrix.file }} from ${{ inputs.name }}

‎.github/workflows/test-action.yml

+186-25
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ jobs:
7777
fail-fast: false
7878
matrix:
7979
include: ${{ fromJSON(inputs.matrix)['linux'] }}
80-
env:
81-
SALT_TRANSPORT: ${{ matrix.transport }}
8280

8381
steps:
8482
- name: Set up Python ${{ inputs.python-version }}
@@ -162,59 +160,143 @@ jobs:
162160
id: run-fast-changed-tests
163161
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }}
164162
run: |
165-
docker exec -e SKIP_REQUIREMENTS_INSTALL=1 -e PRINT_TEST_SELECTION=0 -e PRINT_TEST_PLAN_ONLY=0 -e PRINT_SYSTEM_INFO=0 \
166-
-e RERUN_FAILURES=1 -e GITHUB_ACTIONS_PIPELINE=1 -e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
167-
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} -e CONVERAGE_CONTEXT=${{ matrix.slug }} \
163+
docker exec \
164+
-e SKIP_REQUIREMENTS_INSTALL=1 \
165+
-e PRINT_TEST_SELECTION=0 \
166+
-e PRINT_TEST_PLAN_ONLY=0 \
167+
-e PRINT_SYSTEM_INFO=0 \
168+
-e RERUN_FAILURES=1 \
169+
-e GITHUB_ACTIONS_PIPELINE=1 \
170+
-e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
171+
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} \
172+
-e CONVERAGE_CONTEXT=${{ matrix.slug }} \
173+
-e COLUMNS=190 \
174+
-e PIP_INDEX_URL=${{ vars.PIP_INDEX_URL }} \
175+
-e PIP_TRUSTED_HOST=${{ vars.PIP_TRUSTED_HOST }} \
176+
-e PIP_EXTRA_INDEX_URL=${{ vars.PIP_EXTRA_INDEX_URL }} \
177+
-e PIP_DISABLE_PIP_VERSION_CHECK="1" \
178+
-e RAISE_DEPRECATIONS_RUNTIME_ERRORS="1" \
179+
-e SALT_TRANSPORT=${{ matrix.transport }} \
168180
${{ github.run_id}}_salt-test python3 -m nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
169181
--core-tests --slow-tests --suppress-no-test-exit-code --from-filenames=testrun-changed-files.txt
170182
171183
- name: Run Fast Tests
172184
id: run-fast-tests
173185
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['fast'] }}
174186
run: |
175-
docker exec -e SKIP_REQUIREMENTS_INSTALL=1 -e PRINT_TEST_SELECTION=0 -e PRINT_TEST_PLAN_ONLY=0 -e PRINT_SYSTEM_INFO=0 \
176-
-e RERUN_FAILURES=1 -e GITHUB_ACTIONS_PIPELINE=1 -e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
177-
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} -e CONVERAGE_CONTEXT=${{ matrix.slug }} \
187+
docker exec \
188+
-e SKIP_REQUIREMENTS_INSTALL=1 \
189+
-e PRINT_TEST_SELECTION=0 \
190+
-e PRINT_TEST_PLAN_ONLY=0 \
191+
-e PRINT_SYSTEM_INFO=0 \
192+
-e RERUN_FAILURES=1 \
193+
-e GITHUB_ACTIONS_PIPELINE=1 \
194+
-e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
195+
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} \
196+
-e CONVERAGE_CONTEXT=${{ matrix.slug }} \
197+
-e COLUMNS=190 \
198+
-e PIP_INDEX_URL=${{ vars.PIP_INDEX_URL }} \
199+
-e PIP_TRUSTED_HOST=${{ vars.PIP_TRUSTED_HOST }} \
200+
-e PIP_EXTRA_INDEX_URL=${{ vars.PIP_EXTRA_INDEX_URL }} \
201+
-e PIP_DISABLE_PIP_VERSION_CHECK="1" \
202+
-e RAISE_DEPRECATIONS_RUNTIME_ERRORS="1" \
203+
-e SALT_TRANSPORT=${{ matrix.transport }} \
178204
${{ github.run_id}}_salt-test python3 -m nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
179205
--suppress-no-test-exit-code
180206
181207
- name: Run Slow Tests
182208
id: run-slow-tests
183209
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['slow'] }}
184210
run: |
185-
docker exec -e SKIP_REQUIREMENTS_INSTALL=1 -e PRINT_TEST_SELECTION=0 -e PRINT_TEST_PLAN_ONLY=0 -e PRINT_SYSTEM_INFO=0 \
186-
-e RERUN_FAILURES=1 -e GITHUB_ACTIONS_PIPELINE=1 -e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
187-
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} -e CONVERAGE_CONTEXT=${{ matrix.slug }} \
211+
docker exec \
212+
-e SKIP_REQUIREMENTS_INSTALL=1 \
213+
-e PRINT_TEST_SELECTION=0 \
214+
-e PRINT_TEST_PLAN_ONLY=0 \
215+
-e PRINT_SYSTEM_INFO=0 \
216+
-e RERUN_FAILURES=1 \
217+
-e GITHUB_ACTIONS_PIPELINE=1 \
218+
-e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
219+
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} \
220+
-e CONVERAGE_CONTEXT=${{ matrix.slug }} \
221+
-e COLUMNS=190 \
222+
-e PIP_INDEX_URL=${{ vars.PIP_INDEX_URL }} \
223+
-e PIP_TRUSTED_HOST=${{ vars.PIP_TRUSTED_HOST }} \
224+
-e PIP_EXTRA_INDEX_URL=${{ vars.PIP_EXTRA_INDEX_URL }} \
225+
-e PIP_DISABLE_PIP_VERSION_CHECK="1" \
226+
-e RAISE_DEPRECATIONS_RUNTIME_ERRORS="1" \
227+
-e SALT_TRANSPORT=${{ matrix.transport }} \
188228
${{ github.run_id}}_salt-test python3 -m nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
189229
--suppress-no-test-exit-code --no-fast-tests --slow-tests
190230
191231
- name: Run Core Tests
192232
id: run-core-tests
193233
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['core'] }}
194234
run: |
195-
docker exec -e SKIP_REQUIREMENTS_INSTALL=1 -e PRINT_TEST_SELECTION=0 -e PRINT_TEST_PLAN_ONLY=0 -e PRINT_SYSTEM_INFO=0 \
196-
-e RERUN_FAILURES=1 -e GITHUB_ACTIONS_PIPELINE=1 -e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
197-
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} -e CONVERAGE_CONTEXT=${{ matrix.slug }} \
235+
docker exec \
236+
-e SKIP_REQUIREMENTS_INSTALL=1 \
237+
-e PRINT_TEST_SELECTION=0 \
238+
-e PRINT_TEST_PLAN_ONLY=0 \
239+
-e PRINT_SYSTEM_INFO=0 \
240+
-e RERUN_FAILURES=1 \
241+
-e GITHUB_ACTIONS_PIPELINE=1 \
242+
-e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
243+
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} \
244+
-e CONVERAGE_CONTEXT=${{ matrix.slug }} \
245+
-e COLUMNS=190 \
246+
-e PIP_INDEX_URL=${{ vars.PIP_INDEX_URL }} \
247+
-e PIP_TRUSTED_HOST=${{ vars.PIP_TRUSTED_HOST }} \
248+
-e PIP_EXTRA_INDEX_URL=${{ vars.PIP_EXTRA_INDEX_URL }} \
249+
-e PIP_DISABLE_PIP_VERSION_CHECK="1" \
250+
-e RAISE_DEPRECATIONS_RUNTIME_ERRORS="1" \
251+
-e SALT_TRANSPORT=${{ matrix.transport }} \
198252
${{ github.run_id}}_salt-test python3 -m nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
199253
--suppress-no-test-exit-code --no-fast-tests --core-tests
200254
201255
- name: Run Flaky Tests
202256
id: run-flaky-tests
203257
if: ${{ fromJSON(inputs.testrun)['selected_tests']['flaky'] }}
204258
run: |
205-
docker exec -e SKIP_REQUIREMENTS_INSTALL=1 -e PRINT_TEST_SELECTION=0 -e PRINT_TEST_PLAN_ONLY=0 -e PRINT_SYSTEM_INFO=0 \
206-
-e RERUN_FAILURES=1 -e GITHUB_ACTIONS_PIPELINE=1 -e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
207-
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} -e CONVERAGE_CONTEXT=${{ matrix.slug }} \
259+
docker exec \
260+
-e SKIP_REQUIREMENTS_INSTALL=1 \
261+
-e PRINT_TEST_SELECTION=0 \
262+
-e PRINT_TEST_PLAN_ONLY=0 \
263+
-e PRINT_SYSTEM_INFO=0 \
264+
-e RERUN_FAILURES=1 \
265+
-e GITHUB_ACTIONS_PIPELINE=1 \
266+
-e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
267+
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} \
268+
-e CONVERAGE_CONTEXT=${{ matrix.slug }} \
269+
-e COLUMNS=190 \
270+
-e PIP_INDEX_URL=${{ vars.PIP_INDEX_URL }} \
271+
-e PIP_TRUSTED_HOST=${{ vars.PIP_TRUSTED_HOST }} \
272+
-e PIP_EXTRA_INDEX_URL=${{ vars.PIP_EXTRA_INDEX_URL }} \
273+
-e PIP_DISABLE_PIP_VERSION_CHECK="1" \
274+
-e RAISE_DEPRECATIONS_RUNTIME_ERRORS="1" \
275+
-e SALT_TRANSPORT=${{ matrix.transport }} \
208276
${{ github.run_id}}_salt-test python3 -m nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
209277
--suppress-no-test-exit-code --no-fast-tests --flaky-jail
210278
211279
- name: Run Full Tests
212280
id: run-full-tests
213281
if: ${{ fromJSON(inputs.testrun)['type'] == 'full' }}
214282
run: |
215-
docker exec -e SKIP_REQUIREMENTS_INSTALL=1 -e PRINT_TEST_SELECTION=0 -e PRINT_TEST_PLAN_ONLY=0 -e PRINT_SYSTEM_INFO=0 \
216-
-e RERUN_FAILURES=1 -e GITHUB_ACTIONS_PIPELINE=1 -e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
217-
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} -e CONVERAGE_CONTEXT=${{ matrix.slug }} \
283+
docker exec \
284+
-e SKIP_REQUIREMENTS_INSTALL=1 \
285+
-e PRINT_TEST_SELECTION=0 \
286+
-e PRINT_TEST_PLAN_ONLY=0 \
287+
-e PRINT_SYSTEM_INFO=0 \
288+
-e RERUN_FAILURES=1 \
289+
-e GITHUB_ACTIONS_PIPELINE=1 \
290+
-e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
291+
-e SKIP_CODE_COVERAGE=${{ inputs.skip-code-coverage && '1' || '0' }} \
292+
-e CONVERAGE_CONTEXT=${{ matrix.slug }} \
293+
-e COLUMNS=190 \
294+
-e PIP_INDEX_URL=${{ vars.PIP_INDEX_URL }} \
295+
-e PIP_TRUSTED_HOST=${{ vars.PIP_TRUSTED_HOST }} \
296+
-e PIP_EXTRA_INDEX_URL=${{ vars.PIP_EXTRA_INDEX_URL }} \
297+
-e PIP_DISABLE_PIP_VERSION_CHECK="1" \
298+
-e RAISE_DEPRECATIONS_RUNTIME_ERRORS="1" \
299+
-e SALT_TRANSPORT=${{ matrix.transport }} \
218300
${{ github.run_id}}_salt-test python3 -m nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
219301
--slow-tests --core-tests
220302
@@ -277,9 +359,6 @@ jobs:
277359
fail-fast: false
278360
matrix:
279361
include: ${{ fromJSON(inputs.matrix)['macos'] }}
280-
env:
281-
SALT_TRANSPORT: ${{ matrix.transport }}
282-
283362
steps:
284363

285364
- name: "Throttle Builds"
@@ -362,6 +441,13 @@ jobs:
362441
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
363442
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
364443
COVERAGE_CONTEXT: ${{ matrix.slug }}
444+
COLUMNS: 190
445+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
446+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
447+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
448+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
449+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
450+
SALT_TRANSPORT: ${{ matrix.transport }}
365451
run: |
366452
sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
367453
-k "mac or darwin" --core-tests --slow-tests --suppress-no-test-exit-code \
@@ -380,6 +466,13 @@ jobs:
380466
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
381467
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
382468
COVERAGE_CONTEXT: ${{ matrix.slug }}
469+
COLUMNS: 190
470+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
471+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
472+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
473+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
474+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
475+
SALT_TRANSPORT: ${{ matrix.transport }}
383476
run: |
384477
sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
385478
-k "mac or darwin" --suppress-no-test-exit-code
@@ -397,6 +490,13 @@ jobs:
397490
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
398491
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
399492
COVERAGE_CONTEXT: ${{ matrix.slug }}
493+
COLUMNS: 190
494+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
495+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
496+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
497+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
498+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
499+
SALT_TRANSPORT: ${{ matrix.transport }}
400500
run: |
401501
sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
402502
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --slow-tests
@@ -414,6 +514,13 @@ jobs:
414514
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
415515
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
416516
COVERAGE_CONTEXT: ${{ matrix.slug }}
517+
COLUMNS: 190
518+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
519+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
520+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
521+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
522+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
523+
SALT_TRANSPORT: ${{ matrix.transport }}
417524
run: |
418525
sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
419526
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --core-tests
@@ -431,6 +538,13 @@ jobs:
431538
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
432539
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
433540
COVERAGE_CONTEXT: ${{ matrix.slug }}
541+
COLUMNS: 190
542+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
543+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
544+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
545+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
546+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
547+
SALT_TRANSPORT: ${{ matrix.transport }}
434548
run: |
435549
sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
436550
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --flaky-jail
@@ -448,6 +562,13 @@ jobs:
448562
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
449563
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
450564
COVERAGE_CONTEXT: ${{ matrix.slug }}
565+
COLUMNS: 190
566+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
567+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
568+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
569+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
570+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
571+
SALT_TRANSPORT: ${{ matrix.transport }}
451572
run: |
452573
sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
453574
--slow-tests --core-tests -k "mac or darwin"
@@ -511,8 +632,6 @@ jobs:
511632
fail-fast: false
512633
matrix:
513634
include: ${{ fromJSON(inputs.matrix)['windows'] }}
514-
env:
515-
SALT_TRANSPORT: ${{ matrix.transport }}
516635
steps:
517636
- uses: actions/setup-python@v5
518637
with:
@@ -603,6 +722,13 @@ jobs:
603722
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
604723
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
605724
COVERAGE_CONTEXT: ${{ matrix.slug }}
725+
COLUMNS: 190
726+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
727+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
728+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
729+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
730+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
731+
SALT_TRANSPORT: ${{ matrix.transport }}
606732
run: >
607733
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} --
608734
-k "win" --core-tests --slow-tests --suppress-no-test-exit-code
@@ -621,6 +747,13 @@ jobs:
621747
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
622748
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
623749
COVERAGE_CONTEXT: ${{ matrix.slug }}
750+
COLUMNS: 190
751+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
752+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
753+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
754+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
755+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
756+
SALT_TRANSPORT: ${{ matrix.transport }}
624757
run: >
625758
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} --
626759
-k "win" --suppress-no-test-exit-code
@@ -638,6 +771,13 @@ jobs:
638771
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
639772
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
640773
COVERAGE_CONTEXT: ${{ matrix.slug }}
774+
COLUMNS: 190
775+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
776+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
777+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
778+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
779+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
780+
SALT_TRANSPORT: ${{ matrix.transport }}
641781
run: >
642782
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} --
643783
-k "win" --suppress-no-test-exit-code --no-fast-tests --slow-tests
@@ -655,6 +795,13 @@ jobs:
655795
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
656796
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
657797
COVERAGE_CONTEXT: ${{ matrix.slug }}
798+
COLUMNS: 190
799+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
800+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
801+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
802+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
803+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
804+
SALT_TRANSPORT: ${{ matrix.transport }}
658805
run: >
659806
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} --
660807
-k "win" --suppress-no-test-exit-code --no-fast-tests --core-tests
@@ -672,6 +819,13 @@ jobs:
672819
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
673820
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
674821
COVERAGE_CONTEXT: ${{ matrix.slug }}
822+
COLUMNS: 190
823+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
824+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
825+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
826+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
827+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
828+
SALT_TRANSPORT: ${{ matrix.transport }}
675829
run: >
676830
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} --
677831
-k "win" --suppress-no-test-exit-code --no-fast-tests --flaky-jail
@@ -689,6 +843,13 @@ jobs:
689843
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
690844
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
691845
COVERAGE_CONTEXT: ${{ matrix.slug }}
846+
COLUMNS: 190
847+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
848+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
849+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
850+
PIP_DISABLE_PIP_VERSION_CHECK: "1"
851+
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
852+
SALT_TRANSPORT: ${{ matrix.transport }}
692853
run: >
693854
nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} --
694855
--slow-tests --core-tests -k "win"

0 commit comments

Comments
 (0)