pbTests: Update Vagrantfile paths in VPC/vmDestroy

adoptium · Jun 15, 2021 · eca4861 · eca4861
1 parent e8d0c0c
commit eca4861
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/ansible/pbTestScripts/vagrantPlaybookCheck.sh b/ansible/pbTestScripts/vagrantPlaybookCheck.sh
@@ -91,7 +91,7 @@ checkVars()
 	if [ "$vagrantOS" == "" ]; then
 		usage
 		echo "ERROR: No Vagrant OS specified - Use -h for help, -a for all or -v with one of the following:"
-		ls -1 ../Vagrantfile.* | cut -d. -f4
+		ls -1 ../vagrant/Vagrantfile.* | cut -d. -f4
 		exit 1
 	fi
 	if [[ "$runTest" == true && "$testNativeBuild" == false ]]; then 
@@ -143,9 +143,9 @@ checkVagrantOS()
 {
         local vagrantOSList
         if [[ "$newVagrantFiles" = "true" ]]; then
-                cd ${WORKSPACE}/adoptopenjdkPBTests/${gitFork}-${gitBranch}/ansible
+                cd ${WORKSPACE}/adoptopenjdkPBTests/${gitFork}-${gitBranch}/ansible/vagrant
         else    
-                cd ${scriptPath%/*}/..
+                cd ${scriptPath%/*}/../vagrant
         fi
         vagrantOSList=$(ls -1 Vagrantfile.* | cut -d. -f 2)
         if [[ -f "Vagrantfile.${vagrantOS}" ]]; then

diff --git a/ansible/pbTestScripts/vmDestroy.sh b/ansible/pbTestScripts/vmDestroy.sh
@@ -94,8 +94,13 @@ listOS() {
 
 destroyVMs() {
 	local OS=$1
-	vagrant global-status --prune | awk "/adoptopenjdk$OS/ { print \$1 }" | xargs vagrant destroy -f
-	echo "Destroyed all $OS Vagrant VMs"
+	local ID=$(vagrant global-status --prune | awk "/adoptopenjdk$OS/ { print \$1 }")
+	if [[ $ID != "" ]]; then
+		vagrant destroy -f $ID
+		echo "Destroyed all $OS vagrant VMs"
+	else
+		echo "No $1 vagrant VMs, moving on..."
+	fi
 }
 
 processArgs $*