From: Kaspars Skels <kaspars.skels@att.com>
Date: Wed, 4 Sep 2019 21:19:11 +0000 (-0500)
Subject: Use Shipyard flags to enable more robust site updates
X-Git-Tag: opnfv-9.0.0~46
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F68447%2F1;p=airship.git

Use Shipyard flags to enable more robust site updates

Change-Id: I0b0ec2172767cc0ecbea23ae6752a37cfda43949
Signed-off-by: Kaspars Skels <kaspars.skels@att.com>
---

diff --git a/tools/deploy.sh b/tools/deploy.sh
index 6005f2b..aa04b2c 100755
--- a/tools/deploy.sh
+++ b/tools/deploy.sh
@@ -129,10 +129,13 @@ site_action() {
   # Site deployment with Shipyard, see more details here
   # https://airship-treasuremap.readthedocs.io/en/latest/authoring_and_deployment.html#deploy-site-with-shipyard
 
-  sudo -E treasuremap/tools/airship shipyard create configdocs $SITE_NAME --directory=/target/collect
+  sudo -E treasuremap/tools/airship shipyard create configdocs \
+    $SITE_NAME --directory=/target/collect --replace
   sudo -E treasuremap/tools/airship shipyard commit configdocs
 
-  sudo -E treasuremap/tools/airship shipyard create action $1
+  sudo -E treasuremap/tools/airship shipyard create action \
+    --allow-intermediate-commits $1
+
   sudo -E treasuremap/tools/gate/wait-for-shipyard.sh
 }