Merge branches 'w/2.6/improvement/1687-test-restore-in-ci' and 'q/206…

…1/2.5/improvement/1687-test-restore-in-ci' into tmp/octopus/q/2.6
scality · Jun 2, 2020 · a6756c5 · a6756c5
3 parents 64eb509 + c7a3072 + c21747d
commit a6756c5
Show file tree

Hide file tree

Showing 13 changed files with 411 additions and 90 deletions.
diff --git a/eve/create-volumes.sh b/eve/create-volumes.sh
@@ -37,7 +37,7 @@ check_pod_is_in_phase() {
     [[ $phase = "$expected_phase" ]]
 }
 
-BOOTSTRAP_NODE_NAME=${BOOTSTRAP_NODE_NAME:-$(salt-call --local --out txt grains.get id | cut -c 8-)}
+NODE_NAME=${NODE_NAME:-$(salt-call --local --out txt grains.get id | cut -c 8-)}
 PRODUCT_TXT=${PRODUCT_TXT:-/vagrant/_build/root/product.txt}
 MAX_TRIES=300
 
@@ -55,17 +55,18 @@ KUBECONFIG=${KUBECONFIG:-/etc/kubernetes/admin.conf}
 export KUBECONFIG
 
 echo "Creating storage volumes"
-sed "s/BOOTSTRAP_NODE_NAME/${BOOTSTRAP_NODE_NAME}/" "${PRODUCT_MOUNT}/examples/prometheus-sparse.yaml" | \
+sed "s/NODE_NAME/${NODE_NAME}/" \
+    "${PRODUCT_MOUNT}/examples/prometheus-sparse.yaml" | \
     kubectl apply -f -
 
-echo "Waiting for PV 'bootstrap-alertmanager' to be provisioned"
-if ! retry "$MAX_TRIES" check_pv_exists bootstrap-alertmanager; then
+echo "Waiting for PV '$NODE_NAME-alertmanager' to be provisioned"
+if ! retry "$MAX_TRIES" check_pv_exists "$NODE_NAME-alertmanager"; then
     echo "PV not created"
     exit 1
 fi
 
-echo "Waiting for PV 'bootstrap-prometheus' to be provisioned"
-if ! retry "$MAX_TRIES" check_pv_exists bootstrap-prometheus; then
+echo "Waiting for PV '$NODE_NAME-prometheus' to be provisioned"
+if ! retry "$MAX_TRIES" check_pv_exists "$NODE_NAME-prometheus"; then
     echo "PV not created"
     exit 1
 fi