Revert "Break out testing into its own triple-parallelized flow"

This reverts commit 9e5e2a23d4.
This commit is contained in:
Salt 2021-08-05 11:50:08 -05:00
parent 9e5e2a23d4
commit caabd61057

View File

@ -39,7 +39,6 @@ after_script:
[ -n "$ZEROTIER_NETWORK_ID" ] && \ [ -n "$ZEROTIER_NETWORK_ID" ] && \
zerotier-cli leave "$ZEROTIER_NETWORK_ID" zerotier-cli leave "$ZEROTIER_NETWORK_ID"
## HOUSEKEEPING
Lint: Lint:
stage: lint stage: lint
allow_failure: yes allow_failure: yes
@ -51,45 +50,31 @@ Lint:
- ansible-lint --version - ansible-lint --version
- ansible-lint site.yml - ansible-lint site.yml
## TEST Test:
.test:
stage: test stage: test
interruptible: yes interruptible: yes
except: except:
- pipelines - pipelines
allow_failure: script:
exit_codes: - ansible-playbook --skip-tags no-test -C site.yml --vault-password-file /vaultpw || error="$?"
- 4 - if [ "$error" -eq 4 ]; then echo "Some hosts were unreachable; masking error"; unset error; fi
- if [ -n "$error" ]; then echo "Return code $error"; false; fi
pis:test: Play_Against_Pis:
extends: .test
script:
- ansible-playbook -l tags_pis --skip-tags no-test -C site.yml --vault-password-file /vaultpw
desktop:test:
extends: .test
script:
- ansible-playbook -l tags_desktop --skip-tags no-test -C site.yml --vault-password-file /vaultpw
prod:test:
extends: .test
script:
- ansible-playbook -l tags_prod --skip-tags no-test -C site.yml --vault-password-file /vaultpw
## PLAY
.play:
stage: play stage: play
allow_failure:
exit_codes:
- 4
pis:play:
extends: .play
script: script:
- ansible-playbook -l tags_pis site.yml --vault-password-file /vaultpw - ansible-playbook -l tags_pis site.yml --vault-password-file /vaultpw || error="$?"
desktop:play: - if [ "$error" -eq 4 ]; then echo "Some hosts were unreachable; masking error"; unset error; fi
extends: .play - if [ -n "$error" ]; then echo "Return code $error"; false; fi
Play_Against_Desktops:
stage: play
script: script:
- ansible-playbook -l tags_desktop site.yml --vault-password-file /vaultpw - ansible-playbook -l tags_desktop site.yml --vault-password-file /vaultpw || error="$?"
prod:play: - if [ "$error" -eq 4 ]; then echo "Some hosts were unreachable; masking error"; unset error; fi
extends: .play - if [ -n "$error" ]; then echo "Return code $error"; false; fi
Play_Against_Production:
stage: play
script: script:
- ansible-playbook -l tags_prod site.yml --vault-password-file /vaultpw - ansible-playbook -l tags_prod site.yml --vault-password-file /vaultpw || error="$?"
- if [ "$error" -eq 4 ]; then echo "Some hosts were unreachable; masking error"; unset error; fi
- if [ -n "$error" ]; then echo "Return code $error"; false; fi