Browse Source

Fix airshipctl ref used for deployment.

* Corrected the varaible name used to set airshipctl reference.

Change-Id: Ibc887c5390b707bd131af0106078bff97e2eb14c
changes/38/779838/9
siraj.yasin 11 months ago
parent
commit
1b68187163
  1. 2
      playbooks/airship-treasuremap-ensure-checkout.yaml
  2. 2
      playbooks/airship-treasuremap-gate-runner.yaml
  3. 7
      zuul.d/jobs.yaml

2
playbooks/airship-treasuremap-ensure-checkout.yaml

@ -15,7 +15,7 @@
- hosts: primary
tasks:
- name: Checkout version
shell: git checkout "{{ airshipctl_ref | default('HEAD') }}"
shell: git checkout "{{ AIRSHIPCTL_REF | default('HEAD') }}"
args:
chdir: "{{ zuul.projects['opendev.org/airship/airshipctl'].src_dir }}"

2
playbooks/airship-treasuremap-gate-runner.yaml

@ -16,13 +16,11 @@
environment:
SOPS_IMPORT_PGP: "{{ airship_config_pgp }}"
SOPS_PGP_FP: "{{ airship_config_pgp_fp }}"
AIRSHIPCTL_REF: "5820e22d9f436df2f93d8b71286b2ad0492279bc"
tasks:
- name: "set default gate scripts"
set_fact:
gate_scripts_default:
- ./tools/deployment/01_install_essentials.sh
- ./tools/deployment/21_systemwide_executable.sh
- ./tools/deployment/22_test_configs.sh
- ./tools/deployment/23_pull_documents.sh
- ./tools/deployment/23_generate_secrets.sh

7
zuul.d/jobs.yaml

@ -52,7 +52,7 @@
- job:
name: airship-treasuremap-deploy-test-site
attempts: 1
timeout: 7200
timeout: 8000
required-projects:
- airship/airshipctl
roles:
@ -65,9 +65,9 @@
run: playbooks/airship-treasuremap-gate-runner.yaml
nodeset: airship-treasuremap-single-16GB-bionic-node
vars:
# NOTE(drewwalters96): Set airshipctl_ref to a commit SHA in order to pin
# NOTE(drewwalters96): Set AIRSHIPCTL_REF to a commit SHA in order to pin
# the cloned version of airshipctl to a known/compatible reference.
# airshipctl_ref: ""
AIRSHIPCTL_REF: "5820e22d9f436df2f93d8b71286b2ad0492279bc"
site_name: test-site
gate_scripts:
- ./tools/deployment/01_install_essentials.sh
@ -91,5 +91,6 @@
- job:
name: airship-treasuremap-deploy-virtual-network-cloud
parent: airship-treasuremap-deploy-test-site
timeout: 8000
vars:
site_name: virtual-network-cloud

Loading…
Cancel
Save