From: James Gu <james.gu@att.com>
Date: Thu, 30 Jul 2020 21:32:42 +0000 (-0700)
Subject: Support for newer pyyaml version in pod 10 and 15
X-Git-Tag: opnfv-10.0.0~16
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=123bd87bf7cb18e6a852ae3d1c5f896e4011e562;p=airship.git

Support for newer pyyaml version in pod 10 and 15

Pod 10 and 15 jumphost has upgraded pyyaml vesion that requires the
pyyaml loader fix from upstream Treasuremap that is not available from
1.7. Thsi fix pulls the pyyaml patchset as a temporary workaround to
support pod 10 and 15 until treasuremap 1.9 prime is integrated into
OPNFV.

Signed-off-by: James Gu <james.gu@att.com>
Change-Id: Ic6188a29e2bfb41b4af8aa1db96521ac089f67a6
---

diff --git a/tools/deploy.sh b/tools/deploy.sh
index a166aa0..7fb5273 100755
--- a/tools/deploy.sh
+++ b/tools/deploy.sh
@@ -120,6 +120,7 @@ clone_repos() {
     TREASUREMAP_REF=$(read_yaml $SITE_DEF "$SITE_DEF_KEY")
     echo "TREASUREMAP_REF $TREASUREMAP_REF"
     git_checkout 'https://review.opendev.org/airship/treasuremap' $TREASUREMAP_REF
+    git fetch https://review.opendev.org/airship/treasuremap refs/changes/33/707733/4 && git cherry-pick FETCH_HEAD
   fi
 }