airship
/
airshipctl
Code Issues Proposed changes

Merge "Update 22_test_configs.sh to use new document pull"

This commit is contained in:
Zuul 2021-09-07 16:41:20 +00:00 committed by Gerrit Code Review
parent be518102df 95a43b48ae
commit e24d828f73
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/deployment/22_test_configs.sh
View File

@ -34,7 +34,14 @@ export SITE=${SITE:-"test-site"}
export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"manifests/site/${SITE}/metadata.yaml"}
export SYSTEM_ACTION_RETRIES=30
export SYSTEM_REBOOT_DELAY=30
export AIRSHIP_CONFIG_PHASE_REPO_BRANCH=${BRANCH:-"master"}
# Branch and ref options are mutually exclusive. Ref gets preference since it's more specific
if [[ -z "$AIRSHIP_CONFIG_PHASE_REPO_REF" ]]; then
export AIRSHIP_CONFIG_PHASE_REPO_BRANCH=${BRANCH:-"master"}
export AIRSHIP_CONFIG_PHASE_REPO_REMOTE_REF=""
else
export AIRSHIP_CONFIG_PHASE_REPO_BRANCH=""
export AIRSHIP_CONFIG_PHASE_REPO_REMOTE_REF="$AIRSHIP_CONFIG_PHASE_REPO_REF:$AIRSHIP_CONFIG_PHASE_REPO_REF"
fi
# the git repo url or local file system path to a cloned repo, e.g., /home/stack/airshipctl
export AIRSHIP_CONFIG_PHASE_REPO_URL=${AIRSHIP_CONFIG_PHASE_REPO_URL:-"https://review.opendev.org/airship/airshipctl"}
export AIRSHIP_CONFIG_PHASE_REPO_NAME=${AIRSHIP_CONFIG_PHASE_REPO_NAME:-"airshipctl"}

6
tools/deployment/templates/airshipconfig_template
View File

@ -21,10 +21,12 @@ manifests:
repositories:
primary:
checkout:
branch: ${AIRSHIP_CONFIG_PHASE_REPO_BRANCH}
branch: "${AIRSHIP_CONFIG_PHASE_REPO_BRANCH}"
force: false
remoteRef: ""
ref: "${AIRSHIP_CONFIG_PHASE_REPO_REF}"
tag: ""
fetch:
remoteRefSpec: "${AIRSHIP_CONFIG_PHASE_REPO_REMOTE_REF}"
url: ${AIRSHIP_CONFIG_PHASE_REPO_URL}
auth:
type: "$AIRSHIP_CONFIG_MANIFEST_REPO_AUTH_TYPE"