Skip to content

Commit 8b87aab

Browse files
authored
Ben/tc manifests (#918)
* make tc runs use manifests * win env vars
1 parent 00f39f6 commit 8b87aab

File tree

3 files changed

+9
-16
lines changed

3 files changed

+9
-16
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,18 @@ jobs:
5757
- name: Set Environment (Manual)
5858
if: ${{ inputs.win_installer_link }}
5959
run: |
60-
$env_contents = @"
61-
MANUAL='true'
62-
"@
63-
New-item -Name .env -Value $env_contents -ItemType File -Force
60+
echo "MANUAL=true" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
6461
Write-Host "Running smoke tests on supplied executable"
6562
- name: Set Environment (Scheduled Beta)
6663
if: ${{ inputs.job_to_run == 'Test-Windows' && inputs.is_pull_request == false}}
6764
run: |
68-
$env_contents = @"
69-
TESTRAIL_REPORT='true'
70-
"@
71-
New-item -Name .env -Value $env_contents -ItemType File -Force
65+
echo "TESTRAIL_REPORT=true" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
7266
Write-Host "Running report for most recent Beta on Windows"
7367
Write-Host "$env:TESTRAIL_REPORT"
7468
- name: Select Test Set
7569
if: ${{ inputs.test_set != null }}
7670
run: |
77-
$env_contents = @"
78-
STARFOX_MANIFEST='.\manifests\${{ inputs.test_set }}.yaml'
79-
"@
80-
New-Item -Name .env -Value $env_contents -ItemType File -Force
71+
echo "STARFOX_MANIFEST=.\manifests\${{ inputs.test_set }}.yaml" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
8172
Write-Host "$env:TESTRAIL_REPORT"
8273
shell: pwsh
8374
- name: Set Functional Split

taskcluster/kinds/new-beta-qa/kind.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ tasks:
4444
pipenv run python -c 'from modules import testrail_integration as tri; tri.tc_reportable()' || exit 0;
4545
$FX_EXECUTABLE --version;
4646
. ./keyring-unlock.sh
47-
pipenv run pytest --fx-executable $FX_EXECUTABLE -n 4 tests;
47+
pipenv run choose_ci_set.py;
48+
pipenv run pytest --fx-executable $FX_EXECUTABLE $(cat selected_tests);
4849
export FAILURE=${?};
4950
mv ./ci_pyproject_headed.toml ./pyproject.toml;
5051
export REPORTABLE=1;
51-
pipenv run pytest --fx-executable $FX_EXECUTABLE tests;
52+
pipenv run pytest --fx-executable $FX_EXECUTABLE $(cat selected_tests);
5253
exit $((${?} | ${FAILURE}))
5354
notify:
5455
recipients:

taskcluster/kinds/new-devedition-qa/kind.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ tasks:
4444
pipenv run python -c 'from modules import testrail_integration as tri; tri.tc_reportable()' || exit 0;
4545
$FX_EXECUTABLE --version;
4646
. ./keyring-unlock.sh
47-
pipenv run pytest --fx-executable $FX_EXECUTABLE -n 4 tests;
47+
pipenv run python choose_ci_set.py
48+
pipenv run pytest --fx-executable $FX_EXECUTABLE $(cat selected_tests);
4849
export FAILURE=${?};
4950
mv ./ci_pyproject_headed.toml ./pyproject.toml;
5051
export REPORTABLE=1;
51-
pipenv run pytest --fx-executable $FX_EXECUTABLE tests;
52+
pipenv run pytest --fx-executable $FX_EXECUTABLE $(cat selected_tests);
5253
exit $((${?} | ${FAILURE}))
5354
notify:
5455
recipients:

0 commit comments

Comments
 (0)