summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaspars Skels <kaspars.skels@gmail.com>2019-01-25 22:21:43 -0600
committerKaspars Skels <kaspars.skels@gmail.com>2019-01-30 00:41:47 -0600
commit44551fe7cfd126db4b733e7e2590cee740f3e4c7 (patch)
treeedfee8cf81336743dd4aea293bb857748ed5b3fb
parent1a445f3c0b1467164287b94dc98697be6977e372 (diff)
Enable verbose output for shipyard load stage
Notes
Notes (review): Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+2: Bryan Strassner <strassner.bryan@gmail.com> Code-Review+2: Scott Hussey <sthussey@att.com> Workflow+1: Scott Hussey <sthussey@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 30 Jan 2019 22:04:06 +0000 Reviewed-on: https://review.openstack.org/633332 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/config.sh2
-rwxr-xr-xtools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh8
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/multi_nodes_gate/airship_gate/lib/config.sh b/tools/multi_nodes_gate/airship_gate/lib/config.sh
index ff22d6e..d897cff 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/config.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/config.sh
@@ -3,7 +3,7 @@ export DEFINITION_DEPOT="${TEMP_DIR}/site_yaml/"
3export CERT_DEPOT="${TEMP_DIR}/cert_yaml/" 3export CERT_DEPOT="${TEMP_DIR}/cert_yaml/"
4export GATE_DEPOT="${TEMP_DIR}/gate_yaml/" 4export GATE_DEPOT="${TEMP_DIR}/gate_yaml/"
5export SCRIPT_DEPOT="${TEMP_DIR}/scripts/" 5export SCRIPT_DEPOT="${TEMP_DIR}/scripts/"
6export GENESIS_WORK_DIR=${GENESIS_WORK_DIR:-/work/} 6export GENESIS_WORK_DIR=${GENESIS_WORK_DIR:-/work}
7export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736} 7export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736}
8export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img} 8export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img}
9export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:master} 9export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:master}
diff --git a/tools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh b/tools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh
index 164e4ca..407c47a 100755
--- a/tools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh
+++ b/tools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh
@@ -13,7 +13,7 @@
13# See the License for the specific language governing permissions and 13# See the License for the specific language governing permissions and
14# limitations under the License. 14# limitations under the License.
15 15
16set -e 16set -ex
17 17
18source "${GATE_UTILS}" 18source "${GATE_UTILS}"
19 19
@@ -58,20 +58,20 @@ rsync_cmd "${DEFINITION_DEPOT}"/*.yaml "${GENESIS_NAME}:${GENESIS_WORK_DIR}/site
58 58
59sleep 120 59sleep 120
60 60
61check_configdocs_result "$(shipyard_cmd create configdocs design --directory=/${GENESIS_WORK_DIR}/site --replace)" 61check_configdocs_result "$(shipyard_cmd create configdocs design --directory=${GENESIS_WORK_DIR}/site --replace)"
62 62
63if [[ "${OMIT_CERTS}" == "0" ]] 63if [[ "${OMIT_CERTS}" == "0" ]]
64then 64then
65 ssh_cmd "${GENESIS_NAME}" mkdir -p "${GENESIS_WORK_DIR}/certs" 65 ssh_cmd "${GENESIS_NAME}" mkdir -p "${GENESIS_WORK_DIR}/certs"
66 rsync_cmd "${CERT_DEPOT}"/*.yaml "${GENESIS_NAME}:${GENESIS_WORK_DIR}/certs/" 66 rsync_cmd "${CERT_DEPOT}"/*.yaml "${GENESIS_NAME}:${GENESIS_WORK_DIR}/certs/"
67 check_configdocs_result "$(shipyard_cmd create configdocs certs --directory=/${GENESIS_WORK_DIR}/certs --append)" 67 check_configdocs_result "$(shipyard_cmd create configdocs certs --directory=${GENESIS_WORK_DIR}/certs --append)"
68fi 68fi
69 69
70if [[ "${OMIT_GATE}" == "0" ]] 70if [[ "${OMIT_GATE}" == "0" ]]
71then 71then
72 ssh_cmd "${GENESIS_NAME}" mkdir -p "${GENESIS_WORK_DIR}/gate" 72 ssh_cmd "${GENESIS_NAME}" mkdir -p "${GENESIS_WORK_DIR}/gate"
73 rsync_cmd "${GATE_DEPOT}"/*.yaml "${GENESIS_NAME}:${GENESIS_WORK_DIR}/gate/" 73 rsync_cmd "${GATE_DEPOT}"/*.yaml "${GENESIS_NAME}:${GENESIS_WORK_DIR}/gate/"
74 check_configdocs_result "$(shipyard_cmd create configdocs gate --directory=/${GENESIS_WORK_DIR}/gate --append)" 74 check_configdocs_result "$(shipyard_cmd create configdocs gate --directory=${GENESIS_WORK_DIR}/gate --append)"
75fi 75fi
76 76
77check_configdocs_result "$(shipyard_cmd commit configdocs)" 77check_configdocs_result "$(shipyard_cmd commit configdocs)"