From b734c5549abcc43caaf0ab1703a16807fd14f92f Mon Sep 17 00:00:00 2001 From: Sreejith Punnapuzha Date: Mon, 5 Apr 2021 11:23:38 -0500 Subject: [PATCH] Fix metadatapath in airship config for treasuremap Correct the metadatapath for airshipctl config in treasuremap and assign it to manifest Signed-off-by: Sreejith Punnapuzha Change-Id: I0f36f3cf6452ac38f2a9e9f3d9469e3f65c36357 (cherry picked from commit 0b6375e25a44b383f5e29150f8a7ef7b2bb1c2d0) --- tools/deployment/22_test_configs.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh index 1a73f7e0a..c971d5eb6 100755 --- a/tools/deployment/22_test_configs.sh +++ b/tools/deployment/22_test_configs.sh @@ -37,15 +37,14 @@ export AIRSHIPCTL_REF=${AIRSHIPCTL_REF:-"$(git rev-parse HEAD)"} airshipctl config set-manifest treasuremap_ci \ --repo airshipctl \ --url "${AIRSHIPCTL_REPO_URL}" \ - --commithash "${AIRSHIPCTL_REF}" + --commithash "${AIRSHIPCTL_REF}" \ + --target-path "${AIRSHIP_CONFIG_MANIFEST_DIRECTORY}" \ + --metadata-path "${AIRSHIP_CONFIG_METADATA_PATH}" airshipctl config set-manifest treasuremap_ci \ --repo primary \ --url "${AIRSHIP_CONFIG_PHASE_REPO_URL}" \ - --commithash "${TREASUREMAP_REF}" - -# Add target path and metadata path -airshipctl config set-manifest treasuremap_ci \ + --commithash "${TREASUREMAP_REF}" \ --target-path "${AIRSHIP_CONFIG_MANIFEST_DIRECTORY}" \ --metadata-path "${AIRSHIP_CONFIG_METADATA_PATH}"