From b8936307e5dfb06d5337524f1c06071169dcfdce Mon Sep 17 00:00:00 2001
From: Sreejith Punnapuzha <Sreejith.Punnapuzha@outlook.com>
Date: Tue, 6 Apr 2021 15:09:44 -0500
Subject: [PATCH] Cleanup metadata and target path setup

Cleanup metadata and target path setup in 22_test_configs script.

Signed-off-by: Sreejith Punnapuzha <Sreejith.Punnapuzha@outlook.com>
Change-Id: I9c3332fb125f3d95427ea2c1c00465aba31afd06
---
 tools/deployment/22_test_configs.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh
index c971d5eb6..1a73f7e0a 100755
--- a/tools/deployment/22_test_configs.sh
+++ b/tools/deployment/22_test_configs.sh
@@ -37,14 +37,15 @@ export AIRSHIPCTL_REF=${AIRSHIPCTL_REF:-"$(git rev-parse HEAD)"}
 airshipctl config set-manifest treasuremap_ci \
         --repo airshipctl \
         --url "${AIRSHIPCTL_REPO_URL}" \
-        --commithash "${AIRSHIPCTL_REF}" \
-        --target-path "${AIRSHIP_CONFIG_MANIFEST_DIRECTORY}" \
-        --metadata-path "${AIRSHIP_CONFIG_METADATA_PATH}"
+        --commithash "${AIRSHIPCTL_REF}"
 
 airshipctl config set-manifest treasuremap_ci \
         --repo primary \
         --url "${AIRSHIP_CONFIG_PHASE_REPO_URL}" \
-        --commithash "${TREASUREMAP_REF}" \
+        --commithash "${TREASUREMAP_REF}"
+
+# Add target path and metadata path
+airshipctl config set-manifest treasuremap_ci \
         --target-path "${AIRSHIP_CONFIG_MANIFEST_DIRECTORY}" \
         --metadata-path "${AIRSHIP_CONFIG_METADATA_PATH}"