Skip to content

Commit

Permalink
Fixup last commit which had wrong main Vagrantfile path
Browse files Browse the repository at this point in the history
Signed-off-by: Stewart Addison <sxa@uk.ibm.com>
  • Loading branch information
Stewart Addison committed Jan 6, 2020
1 parent c4643ee commit b645c1f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ansible/pbTestScripts/vagrantPlaybookCheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ checkVagrantOS()
local vagrantOSlist=$(ls -1 Vagrantfile.* | cut -d. -f 2)
if [[ "$newVagrantFiles" = "true" ]] && [[ -f "Vagrantfile.${vagrantOS}" ]]; then
echo "Vagrantfile detected"
elif [[ "$newVagrantFiles" != "true" ]] && [[ -f "$WORKSPACE/ansible/pbTestScripts/Vagrantfile.${vagrantOS}" ]]; then
elif [[ "$newVagrantFiles" != "true" ]] && [[ -f "$WORKSPACE/ansible/Vagrantfile.${vagrantOS}" ]]; then
echo "Vagrantfile detected"
elif [[ "$vagrantOS" == "all" ]]; then
vagrantOS=$vagrantOSlist
Expand Down Expand Up @@ -169,7 +169,7 @@ startVMPlaybook()
if [ "$newVagrantFiles" = "true" ]; then
ln -sf Vagrantfile.$OS Vagrantfile
else
ln -sf $WORKSPACE/ansible/pbTestScripts/Vagrantfile.$OS Vagrantfile
ln -sf $WORKSPACE/ansible/Vagrantfile.$OS Vagrantfile
fi
# Copy the machine's ssh key for the VMs to use, after removing prior files
rm -f id_rsa.pub id_rsa
Expand Down Expand Up @@ -212,7 +212,7 @@ startVMPlaybookWin()
if [ "$newVagrantFiles" = "true" ]; then
ln -sf Vagrantfile.$OS Vagrantfile
else
ln -sf $WORKSPACE/ansible/pbTestScripts/Vagrantfile.$OS Vagrantfile
ln -sf $WORKSPACE/ansible/Vagrantfile.$OS Vagrantfile
fi
# Remove the Hosts files if they're found
rm -f playbooks/AdoptOpenJDK_Windows_Playbook/hosts.tmp
Expand Down

0 comments on commit b645c1f

Please sign in to comment.