tests: run vagrant_up.sh from dirname

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 3c0e06ea0cdf3098497274dd8ff5a63b117d20c5)

diff --git a/tests/scripts/vagrant_up.sh b/tests/scripts/vagrant_up.sh
index 6a87f408a26524f4e9db26614c9b6995c51f0018..05b17582f49b3b402be33502bd1511e70424356b 100644 (file)
--- a/tests/scripts/vagrant_up.sh
+++ b/tests/scripts/vagrant_up.sh
@@ -1,4 +1,12 @@
 #!/bin/bash
+set -x
+if [[ -n $1 ]]; then
+  DIRECTORY=$1
+  shift
+else
+  DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+fi
+pushd "${DIRECTORY}"
 
 if [[ "${CEPH_ANSIBLE_VAGRANT_BOX}" =~ "centos/stream" ]]; then
   EL_VERSION="${CEPH_ANSIBLE_VAGRANT_BOX: -1}"
@@ -16,4 +24,5 @@ do
   sleep 5
 done
 
-sleep 10
\ No newline at end of file
+sleep 10
+popd

diff --git a/tox-cephadm.ini b/tox-cephadm.ini
index 582d035f1145820392329c5682d8d1aab5976799..f84357d1dcbf273c8ec2b6cf0c98d8f3e5c56959 100644 (file)
--- a/tox-cephadm.ini
+++ b/tox-cephadm.ini
@@ -29,7 +29,7 @@ changedir= {toxinidir}/tests/functional/cephadm
 
 commands=
   ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
-  bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
+  bash {toxinidir}/tests/scripts/vagrant_up.sh {changedir} --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
   ansible-playbook -vv --diff -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/cephadm.yml --extra-vars "\

diff --git a/tox-docker2podman.ini b/tox-docker2podman.ini
index 7774b1324921885acd5280d4d16ce87a9e239e3b..33eb779f64fefada319d2e51757a0a6c8d28190c 100644 (file)
--- a/tox-docker2podman.ini
+++ b/tox-docker2podman.ini
@@ -29,7 +29,7 @@ changedir= {toxinidir}/tests/functional/docker2podman
 
 commands=
   ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
-  bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
+  bash {toxinidir}/tests/scripts/vagrant_up.sh {changedir} --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
   # configure lvm

diff --git a/tox-external_clients.ini b/tox-external_clients.ini
index bf33c3edb35b2184a1cbb787f88692d6a9340fd4..b03f30211cf31ac02dc3a9ea671c8bbcc21e673e 100644 (file)
--- a/tox-external_clients.ini
+++ b/tox-external_clients.ini
@@ -32,7 +32,7 @@ deps= -r{toxinidir}/tests/requirements.txt
 changedir={toxinidir}/tests/functional/external_clients{env:CONTAINER_DIR:}
 commands=
   ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
-  bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
+  bash {toxinidir}/tests/scripts/vagrant_up.sh {changedir} --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
   ansible-playbook -vv --diff -i {changedir}/inventory {toxinidir}/tests/functional/setup.yml

diff --git a/tox-podman.ini b/tox-podman.ini
index c458cf6d4ebb8473da65830c0e81f736fea0eb2b..6dfd6f920973e3cf845212f620cab4318ed235f8 100644 (file)
--- a/tox-podman.ini
+++ b/tox-podman.ini
@@ -33,7 +33,7 @@ changedir= {toxinidir}/tests/functional/podman
 
 commands=
   ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
-  bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
+  bash {toxinidir}/tests/scripts/vagrant_up.sh {changedir} --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
   # configure lvm

diff --git a/tox-rbdmirror.ini b/tox-rbdmirror.ini
index fc8701330714ec866b5f9fe52c53f11175c571ad..b1f70fddcec8361ae23d059885f21db8dd40a983 100644 (file)
--- a/tox-rbdmirror.ini
+++ b/tox-rbdmirror.ini
@@ -40,7 +40,7 @@ deps= -r{toxinidir}/tests/requirements.txt
 changedir={toxinidir}/tests/functional/rbdmirror{env:CONTAINER_DIR:}
 commands=
   ansible-galaxy install -r {toxinidir}/requirements.yml -v
-  bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
+  bash {toxinidir}/tests/scripts/vagrant_up.sh {changedir} --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
   non_container: ansible-playbook -vv --diff -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
@@ -63,7 +63,7 @@ commands=
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
   "
 
-  bash -c "cd {changedir}/secondary && bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}"
+  bash -c "cd {changedir}/secondary && bash {toxinidir}/tests/scripts/vagrant_up.sh {changedir}/secondary --no-provision {posargs:--provider=virtualbox}"
   bash -c "cd {changedir}/secondary && bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}/secondary"
   ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/tests/functional/setup.yml
   ansible-playbook -vv --diff -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir}/secondary ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"

diff --git a/tox-shrink_osd.ini b/tox-shrink_osd.ini
index ddb60220a0149aa5a0b833aaeea3f24e733a4a15..5b3cba56b022aa01fddef3f09ba9c689d7c6a7df 100644 (file)
--- a/tox-shrink_osd.ini
+++ b/tox-shrink_osd.ini
@@ -84,7 +84,7 @@ commands=
   ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
   ansible-playbook -vv --diff -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
 
-  bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
+  bash {toxinidir}/tests/scripts/vagrant_up.sh {changedir} --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
   # configure lvm

diff --git a/tox-subset_update.ini b/tox-subset_update.ini
index 6a2180c50010d785a4151c184c32d081ec2369ce..82081a98d4382ad87fed8c6ee6d4458317552178 100644 (file)
--- a/tox-subset_update.ini
+++ b/tox-subset_update.ini
@@ -37,7 +37,7 @@ deps= -r{toxinidir}/tests/requirements.txt
 changedir={toxinidir}/tests/functional/subset_update{env:CONTAINER_DIR:}
 commands=
   ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
-  bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
+  bash {toxinidir}/tests/scripts/vagrant_up.sh {changedir} --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml

diff --git a/tox.ini b/tox.ini
index 4302539db3e5995c3385bb41dd6bd6c68876d83c..1aa3fda70d0fb8258be6bde32e9568ca6e053eb0 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ setenv=
 deps= -r{toxinidir}/tests/requirements.txt
 changedir={toxinidir}/tests/functional/infra_lv_create
 commands=
-  bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
+  bash {toxinidir}/tests/scripts/vagrant_up.sh {changedir} --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
   ansible-playbook -vv --diff -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/lv-create.yml
@@ -313,7 +313,7 @@ changedir=
 commands=
   ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
 
-  bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
+  bash {toxinidir}/tests/scripts/vagrant_up.sh {changedir} --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
   # configure lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file)