Merge "Update Airshipctl pin, kustomize install condition" into v2

This commit is contained in:
Zuul 2021-04-06 15:38:13 +00:00 committed by Gerrit Code Review
commit 73a5fbb0dc
3 changed files with 5 additions and 3 deletions

View File

@ -36,7 +36,6 @@
include_role:
name: install-kustomize
# Installs kustomize plugin functionality needed for rendering below
- name: install airshipctl
shell: |
cd {{ local_src_dir | default(zuul.project.src_dir) }}

View File

@ -29,4 +29,7 @@ cd ${AIRSHIPCTL_PROJECT}
./tools/deployment/provider_common/03_install_pip.sh
./tools/deployment/provider_common/04_install_yq.sh
./tools/deployment/01_install_kubectl.sh
./tools/install_kustomize.sh
if ! $(which kustomize > /dev/null); then
./tools/install_kustomize.sh
fi

View File

@ -14,7 +14,7 @@
vars:
# 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: "030bb123d8fedd39125dd6eae92f48e0d32a7469"
AIRSHIPCTL_REF: "892bb6a16d53a0f43571284db83901bef53ed440"
sphinx_build_dir: docs/build
check:
jobs: