Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
pipenv run python -c "import sys; print(sys.platform)"
$env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
Start-Process -FilePath $env:FX_EXECUTABLE -ArgumentList "--version" -Wait -NoNewWindow
pipenv run python choose_ci_set.py
pipenv run python choose_test_split.py
pipenv run pytest $(cat selected_tests) --geckodriver=geckodriver.exe
$env:TEST_EXIT_CODE = $LASTEXITCODE
mv artifacts artifacts-win || true
Expand All @@ -130,7 +130,7 @@ jobs:
rm ./pyproject.toml;
mv ./ci_pyproject_headed.toml ./pyproject.toml;
$env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
pipenv run python choose_ci_set.py
pipenv run python choose_test_split.py
pipenv run pytest $(cat selected_tests) --geckodriver=geckodriver.exe
$env:TEST_EXIT_CODE = $LASTEXITCODE
rm artifacts/assets -r -Force
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
FX_EXECUTABLE: /Volumes/${{ steps.setup.outputs.app_name }}/${{ steps.setup.outputs.app_name }}.app/Contents/MacOS/firefox
run: |
"$FX_EXECUTABLE" --version
pipenv run python choose_ci_set.py
pipenv run python choose_test_split.py
pipenv run pytest --fx-executable="$FX_EXECUTABLE" $(cat selected_tests) || TEST_EXIT_CODE=$?
mv artifacts artifacts-mac || true
exit $TEST_EXIT_CODE
Expand All @@ -214,7 +214,7 @@ jobs:
REPORTABLE: true
run: |
mv ./ci_pyproject_headed.toml ./pyproject.toml;
pipenv run python choose_ci_set.py
pipenv run python choose_test_split.py
pipenv run pytest --fx-executable="$FX_EXECUTABLE" $(cat selected_tests) || TEST_EXIT_CODE=$?
mv -n artifacts/* artifacts-mac/ || true
exit $TEST_EXIT_CODE
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
FX_EXECUTABLE: ./firefox/firefox
run: |
"$FX_EXECUTABLE" --version;
pipenv run python choose_ci_set.py;
pipenv run python choose_test_split.py;
Xvfb :99 -screen 0 '1600x1200x24' > artifacts/xvfb.log &
DISPLAY=:99 pipenv run pytest --fx-executable="$FX_EXECUTABLE" $(cat selected_tests) || TEST_EXIT_CODE=$?
exit $TEST_EXIT_CODE
Expand All @@ -274,7 +274,7 @@ jobs:
FX_EXECUTABLE: ./firefox/firefox
run: |
mv ./ci_xvfb_pyproject_headed.toml ./pyproject.toml;
pipenv run python choose_ci_set.py
pipenv run python choose_test_split.py
DISPLAY=:99 pipenv run pytest --fx-executable="$FX_EXECUTABLE" $(cat selected_tests) || TEST_EXIT_CODE=$?
exit $TEST_EXIT_CODE

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion taskcluster/kinds/new-beta-func/kind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tasks:
pipenv run python -c 'from modules import testrail_integration as tri; tri.tc_reportable()' || exit 0;
$FX_EXECUTABLE --version;
. ./keyring-unlock.sh
pipenv run python choose_ci_set.py;
pipenv run python choose_test_split.py;
pipenv run pytest --fx-executable $FX_EXECUTABLE $(cat selected_tests);
export FAILURE=${?};
mv ./ci_pyproject_headed.toml ./pyproject.toml;
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/kinds/new-beta-qa/kind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ tasks:
pipenv run python -c 'from modules import testrail_integration as tri; tri.tc_reportable()' || exit 0;
$FX_EXECUTABLE --version;
. ./keyring-unlock.sh
pipenv run python choose_ci_set.py;
pipenv run python choose_test_split.py;
pipenv run pytest --fx-executable $FX_EXECUTABLE $(cat selected_tests);
export FAILURE=${?};
mv ./ci_pyproject_headed.toml ./pyproject.toml;
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/kinds/new-devedition-qa/kind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ tasks:
pipenv run python -c 'from modules import testrail_integration as tri; tri.tc_reportable()' || exit 0;
$FX_EXECUTABLE --version;
. ./keyring-unlock.sh
pipenv run python choose_ci_set.py
pipenv run python choose_test_split.py
pipenv run pytest --fx-executable $FX_EXECUTABLE $(cat selected_tests);
export FAILURE=${?};
mv ./ci_pyproject_headed.toml ./pyproject.toml;
Expand Down
4 changes: 2 additions & 2 deletions taskcluster/kinds/run-smoke-tests/kind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ tasks:
./firefox/firefox --version;
. ./keyring-unlock.sh
if [[ ! $(python3 choose_test_channel.py) =~ "smoke" ]]; then exit 0; fi
pipenv run python3 choose_ci_set.py
pipenv run python3 choose_test_split.py
pipenv run pytest --fx-executable ./firefox/firefox -n 4 $(cat selected_tests)
export FAILURE=${?}
mv ./ci_pyproject_headed.toml ./pyproject.toml;
pipenv run python3 choose_ci_set.py
pipenv run python3 choose_test_split.py
pipenv run pytest --fx-executable ./firefox/firefox $(cat selected_tests)
exit $((${?} | ${FAILURE}))
notify:
Expand Down