From fedaad02e3d0a376a0a2b7ba68c76af9c6e87cbc Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Tue, 21 Sep 2021 15:40:39 -0500 Subject: [PATCH] Fix AIAP manifest branch checkout behavior 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 Change-Id: Ibb2798201f8e02333289f193355f3aa2a6c627ad --- tools/airship-in-a-pod/runner/assets/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/airship-in-a-pod/runner/assets/entrypoint.sh b/tools/airship-in-a-pod/runner/assets/entrypoint.sh index 93c39d768..e9a6085d1 100755 --- a/tools/airship-in-a-pod/runner/assets/entrypoint.sh +++ b/tools/airship-in-a-pod/runner/assets/entrypoint.sh @@ -68,7 +68,7 @@ set -x export AIRSHIP_CONFIG_MANIFEST_DIRECTORY="/opt/manifests" ./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" else export NO_CHECKOUT="true"