airship/airshipctl
Code Issues Proposed changes

Fix AIAP manifest branch checkout behavior

Browse Source 
Even when specifying a manifest branch in the AIAP overrides, the
entrypoint script overrides/disables the checkout behavior of the
airshipctl document pull script if AIRSHIP_CONFIG_PHASE_REPO_REF is not
set. This change updates the entrypoint script to check if
AIRSHIP_CONFIG_PHASE_REPO_BRANCH is specified before overriding the
checkout behavior.

Signed-off-by: Drew Walters <drewwalters@microsoft.com>
Change-Id: Ibb2798201f8e02333289f193355f3aa2a6c627ad
This commit is contained in:
Drew Walters 2021-09-21 15:40:39 -05:00
parent 4a51359b75
commit fedaad02e3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/airship-in-a-pod/runner/assets/entrypoint.sh
View File

@ -68,7 +68,7 @@ set -x
export AIRSHIP_CONFIG_MANIFEST_DIRECTORY="/opt/manifests" export AIRSHIP_CONFIG_MANIFEST_DIRECTORY="/opt/manifests"
./tools/deployment/22_test_configs.sh ./tools/deployment/22_test_configs.sh
if [[ -n "$AIRSHIP_CONFIG_PHASE_REPO_REF" ]]; then if [[ -n "$AIRSHIP_CONFIG_PHASE_REPO_REF" || -n "$AIRSHIP_CONFIG_PHASE_REPO_BRANCH" ]]; then
export NO_CHECKOUT="false" export NO_CHECKOUT="false"
else else
export NO_CHECKOUT="true" export NO_CHECKOUT="true"