From 43d4ebe164657c071b8db3f241cafd19a810a2f5 Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Mon, 28 Sep 2020 15:00:24 +0000 Subject: [PATCH] Add CI metadata path override This change adds an environment variable override to change the metadata path in the Airship config file when using the CI-driven deployment scripts. This will enable the Treasuremap repository to store metadata.yaml at the site level while using the same deployment scripts from airshipctl. Change-Id: I0862a87417ad7a4d8666df7b34e25327bb40e251 Signed-off-by: Drew Walters --- tools/deployment/22_test_configs.sh | 1 + tools/deployment/templates/airshipconfig_template | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh index 0f165784c..d5128e1be 100755 --- a/tools/deployment/22_test_configs.sh +++ b/tools/deployment/22_test_configs.sh @@ -30,6 +30,7 @@ export REMOTE_PROXY=false export AIRSHIP_CONFIG_ISO_SERVE_HOST=${HOST:-"localhost"} export AIRSHIP_CONFIG_ISO_PORT=${SERVE_PORT} export AIRSHIP_CONFIG_ISO_NAME=${ISO_NAME:-"ubuntu-focal.iso"} +export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"airshipctl/manifests/metadata.yaml"} export SYSTEM_ACTION_RETRIES=30 export SYSTEM_REBOOT_DELAY=30 export AIRSHIP_CONFIG_PRIMARY_REPO_BRANCH=${BRANCH:-"master"} diff --git a/tools/deployment/templates/airshipconfig_template b/tools/deployment/templates/airshipconfig_template index 24112dd1d..946d9671e 100644 --- a/tools/deployment/templates/airshipconfig_template +++ b/tools/deployment/templates/airshipconfig_template @@ -28,5 +28,5 @@ manifests: remoteRef: "" tag: "" url: ${AIRSHIP_CONFIG_PRIMARY_REPO_URL} - metadataPath: airshipctl/manifests/metadata.yaml + metadataPath: ${AIRSHIP_CONFIG_METADATA_PATH} targetPath: ${AIRSHIP_CONFIG_MANIFEST_DIRECTORY}