Browse Source

Enable verbose output for shipyard load stage

Change-Id: Ieebf68903e9d22848ea457b7d080de8337905868
Kaspars Skels 2 months ago
parent
commit
44551fe7cf

+ 1
- 1
tools/multi_nodes_gate/airship_gate/lib/config.sh View File

@@ -3,7 +3,7 @@ export DEFINITION_DEPOT="${TEMP_DIR}/site_yaml/"
3 3
 export CERT_DEPOT="${TEMP_DIR}/cert_yaml/"
4 4
 export GATE_DEPOT="${TEMP_DIR}/gate_yaml/"
5 5
 export SCRIPT_DEPOT="${TEMP_DIR}/scripts/"
6
-export GENESIS_WORK_DIR=${GENESIS_WORK_DIR:-/work/}
6
+export GENESIS_WORK_DIR=${GENESIS_WORK_DIR:-/work}
7 7
 export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736}
8 8
 export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img}
9 9
 export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:master}

+ 4
- 4
tools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh View File

@@ -13,7 +13,7 @@
13 13
 # See the License for the specific language governing permissions and
14 14
 # limitations under the License.
15 15
 
16
-set -e
16
+set -ex
17 17
 
18 18
 source "${GATE_UTILS}"
19 19
 
@@ -58,20 +58,20 @@ rsync_cmd "${DEFINITION_DEPOT}"/*.yaml "${GENESIS_NAME}:${GENESIS_WORK_DIR}/site
58 58
 
59 59
 sleep 120
60 60
 
61
-check_configdocs_result "$(shipyard_cmd create configdocs design --directory=/${GENESIS_WORK_DIR}/site --replace)"
61
+check_configdocs_result "$(shipyard_cmd create configdocs design --directory=${GENESIS_WORK_DIR}/site --replace)"
62 62
 
63 63
 if [[ "${OMIT_CERTS}" == "0" ]]
64 64
 then
65 65
   ssh_cmd "${GENESIS_NAME}" mkdir -p "${GENESIS_WORK_DIR}/certs"
66 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)"
68 68
 fi
69 69
 
70 70
 if [[ "${OMIT_GATE}" == "0" ]]
71 71
 then
72 72
   ssh_cmd "${GENESIS_NAME}" mkdir -p "${GENESIS_WORK_DIR}/gate"
73 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)"
75 75
 fi
76 76
 
77 77
 check_configdocs_result "$(shipyard_cmd commit configdocs)"

Loading…
Cancel
Save