pbTests: Removed build Role, altered testScript to use ansible

adoptium · Oct 30, 2019 · 34ef93d · 34ef93d
1 parent 9afaa96
commit 34ef93d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 29 deletions.
diff --git a/ansible/pbTestScripts/testScript.sh b/ansible/pbTestScripts/testScript.sh
@@ -148,8 +148,9 @@ testBuildWin()
 {
 	# Ensures the git config won't change line endings
 	vagrant powershell -c "Start-Process powershell -Verb runAs; C:/cygwin64/bin/sed -i -e 's/autocrlf.*/autocrlf = false/g' C:\\ProgramData/Git/config"
-	# Run the build role of the Playbook
-	cd $WORKSPACE/adoptopenjdkPBTests/$folderName-$branchName/ansible && ansible-playbook -i playbooks/AdoptOpenJDK_Windows_Playbook/hosts.win -u vagrant --tags build playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
+	vagrant powershell -c "cd C:/; if (-not (Test-Path C:/openjdk-build -PathType Container) ) { echo 'Cloning openJDK-build repo' ; git clone https://github.com/adoptopenjdk/openjdk-build ; sleep 3 }"
+	# Runs the build script via ansible
+	cd $WORKSPACE/adoptopenjdkPBTests/$folderName-$branchName/ansible && ansible all -i playbooks/AdoptOpenJDK_Windows_Playbook/hosts.win -u vagrant -m raw -a "Start-Process powershell.exe -Verb runAs; cd C:/; sh C:/vagrant/pbTestScripts/buildJDKWin.sh"
 }
 
 # Takes the OS as arg 1

diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
@@ -62,4 +62,3 @@
     - nasm                        # OpenJ9
     - Rust                        # IcedTea-Web
     - IcedTea-Web                 # For Jenkins webstart
-    - Build                       # Role to build JDK8
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Build/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Build/tasks/main.yml