airship/airshipctl
Code Issues Proposed changes

Merge "Fix gate script index issue"

Browse Source
This commit is contained in:
Zuul 2021-07-21 18:27:53 +00:00 committed by Gerrit Code Review
commit 8af53241e1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/airshipctl-gate-runner.yaml
View File

@ -13,6 +13,7 @@
- hosts: primary - hosts: primary
vars_files: vars_files:
- vars/test-config.yaml - vars/test-config.yaml
name: airshipctl_gate_runner
environment: environment:
SOPS_IMPORT_PGP: "{{ airship_config_pgp }}" SOPS_IMPORT_PGP: "{{ airship_config_pgp }}"
SOPS_PGP_FP_ENCRYPT: "{{ airship_config_pgp_fp1 }}" SOPS_PGP_FP_ENCRYPT: "{{ airship_config_pgp_fp1 }}"
@ -29,7 +30,7 @@
GCP_NETWORK_NAME: "ZGVmYXVsdA==" GCP_NETWORK_NAME: "ZGVmYXVsdA=="
GCP_B64ENCODED_CREDENTIALS: "bjEtc3RhbmRhcmQtNA==" GCP_B64ENCODED_CREDENTIALS: "bjEtc3RhbmRhcmQtNA=="
tasks: tasks:
- name: "set default gate scripts" - name: "set_default_gate_scripts"
set_fact: set_fact:
gate_scripts_default: gate_scripts_default:
- ./tools/deployment/21_systemwide_executable.sh - ./tools/deployment/21_systemwide_executable.sh

4
tools/gate/20_run_gate_runner.sh
View File

@ -80,9 +80,9 @@ while true; do
esac esac
done done
SCRIPT_LIST=$(cat $ZUUL_JOBS_PATH | yq '.[9].job.vars.gate_scripts[]' -c -r) SCRIPT_LIST=$(cat $ZUUL_JOBS_PATH | yq '.[] | select(.job.name == "airship-airshipctl-gate-script-runner") | .job.vars.gate_scripts[]' -c -r)
if [[ ! $SCRIPT_LIST ]]; then if [[ ! $SCRIPT_LIST ]]; then
SCRIPT_LIST=$(cat $GATE_RUNNER_YAML_PATH | yq '.[0].tasks[0].set_fact.deploy_test_site_scripts_default[]' -c -r) SCRIPT_LIST=$(cat $GATE_RUNNER_YAML_PATH | yq '.[]| select (.name=="airshipctl_gate_runner")| .tasks[]| select (.name=="set_default_gate_scripts")| .set_fact.gate_scripts_default[]' -c -r)
fi fi
SKIP_LIST=$(echo ${SKIP_LIST//,/ }) SKIP_LIST=$(echo ${SKIP_LIST//,/ })