airship
/
treasuremap
Code Issues Proposed changes

Fix airshipctl ref used for deployment. 

* Corrected the varaible name used to set airshipctl reference.

Change-Id: Ibc887c5390b707bd131af0106078bff97e2eb14c
This commit is contained in:
siraj.yasin 2021-03-10 17:19:58 +00:00
parent 52e072ef8a
commit 1b68187163
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

7
zuul.d/jobs.yaml
View File

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