Salt installer change: standardize on putting the certs directory under

the local_config_dir directory, this simplifies things.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/jenkins/test-arvados-multinode/script_test.multinode.sh b/jenkins/test-arvados-multinode/script_test.multinode.sh
index 66ba8ee2c0c5845bdbb48ce44c5ee20ceb92412c..596e6b7d67b9bcb1d9ae641baea9c07b242206d5 100755 (executable)
--- a/jenkins/test-arvados-multinode/script_test.multinode.sh
+++ b/jenkins/test-arvados-multinode/script_test.multinode.sh
@@ -66,7 +66,8 @@ sed "s#cluster_fixme_or_this_wont_work#${CLUSTER_NAME}#g;
      s/# VERSION=.*$/VERSION=\"${VERSION}\"/g" \
      local.params.example.multiple_hosts > ${GIT_COMMIT}/debian11-local.params.example.multiple_hosts
 
      s/# VERSION=.*$/VERSION=\"${VERSION}\"/g" \
      local.params.example.multiple_hosts > ${GIT_COMMIT}/debian11-local.params.example.multiple_hosts
 

-cp -vr /usr/local/arvados-dev/jenkins/test-arvados-multinode/certs tests provision.sh ${GIT_COMMIT}
+cp -vr tests provision.sh ${GIT_COMMIT}
+cp -vr /usr/local/arvados-dev/jenkins/test-arvados-multinode/certs/* ${GIT_COMMIT}/local_config_dir/certs/

 
 echo "== Setting up NODE_A with database,api,controller,keepstore,websocket,workbench2,keepbalance,keepproxy,workbench,dispatcher"
 
 
 echo "== Setting up NODE_A with database,api,controller,keepstore,websocket,workbench2,keepbalance,keepproxy,workbench,dispatcher"