[ARVADOS-DEV] updated: d7855567654beebaea9c6a7e3c975cf976969b92

[Git user]

Summary of changes:
 jenkins/test-arvados-multinode/script_test.multinode.sh | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

       via  d7855567654beebaea9c6a7e3c975cf976969b92 (commit)
      from  a92fb918f64ac35eedecb0633c85f2a6d9a4d5cc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d7855567654beebaea9c6a7e3c975cf976969b92
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Mon Apr 11 12:20:15 2022 -0300

    16375: refactor multi-node testing
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/jenkins/test-arvados-multinode/script_test.multinode.sh b/jenkins/test-arvados-multinode/script_test.multinode.sh
index 70bd830..56d7746 100755
--- a/jenkins/test-arvados-multinode/script_test.multinode.sh
+++ b/jenkins/test-arvados-multinode/script_test.multinode.sh
@@ -19,24 +19,17 @@ _exit_handler() {
 
 # trap '_exit_handler $LINENO' EXIT ERR
 
-echo "== Setting up terraform"
 cd terraform || exit 1
 
-sed "s/__BUILD_TAG__/${BUILD_TAG}/g" terraform.tfvars > /tmp/terraform.tfvars-${GIT_COMMIT}
-
-echo "== Setting up instances"
-terraform init && \
-terraform apply -auto-approve -var-file=/tmp/terraform.tfvars-${GIT_COMMIT}
-
-echo "   + Waiting 10 seconds for nodes to be up"
-sleep 10
-
 NODE_A_EXT=$(terraform output -json public_ip | jq -r .[0])
 NODE_B_EXT=$(terraform output -json public_ip | jq -r .[1])
 NODE_A_INT=$(terraform output -json private_ip | jq -r .[0])
 NODE_B_INT=$(terraform output -json private_ip | jq -r .[1])
 CLUSTER_NAME=$(terraform output -json cluster_name | jq -r .)
 
+echo "   + Waiting 10 seconds for nodes to be up"
+sleep 10
+
 cd $WORKSPACE/tools/salt-install || exit 1
 mkdir ${GIT_COMMIT}
 
@@ -96,7 +89,3 @@ ssh -o "StrictHostKeyChecking=no" admin@${NODE_B_EXT} sudo ./provision.sh \
     --config debian11-local.params.example.multiple_hosts \
     --development \
     --test
-
-echo "== Destroying instances"
-cd -
-terraform destroy -auto-approve -var-file=/tmp/terraform.tfvars-${GIT_COMMIT}

-----------------------------------------------------------------------


hooks/post-receive
--