Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pbTests: Added option to specify openjdk-build repo #1170

Merged
merged 1 commit into from
Feb 24, 2020
Merged

pbTests: Added option to specify openjdk-build repo #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/pbTestScripts/buildJDK.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ if [[ $(uname) == "FreeBSD" ]]; then
export TARGET_OS=FreeBSD
export VARIANT=hotspot
export JAVA_TO_BUILD=jdk11u
export JDK_BOOT_DIR=/usr/local/openjdk10
export JDK_BOOT_DIR=/usr/local/openjdk11
export JAVA_HOME=/usr/local/openjdk8
fi

Expand Down
5 changes: 4 additions & 1 deletion ansible/pbTestScripts/vagrantPlaybookCheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -eu
branchName=''
folderName=''
gitURL=''
buildURL=''
vagrantOS=''
retainVM=false
testNativeBuild=false
Expand Down Expand Up @@ -40,6 +41,8 @@ processArgs()
newVagrantFiles=true;;
"--skip-more" | "-sm" )
skipFullSetup=",nvidia_cuda_toolkit,MSVS_2010,MSVS_2017";;
"--build-repo" | "-br" )
buildURL="--URL $1"; shift;;
"--help" | "-h" )
usage; exit 0;;
*) echo >&2 "Invalid option: ${opt}"; echo "This option was unrecognised."; usage; exit 1;;
Expand Down Expand Up @@ -203,7 +206,7 @@ startVMPlaybook()
local pb_failed=$?
cd $WORKSPACE/adoptopenjdkPBTests/$folderName-$branchName/ansible
if [[ "$testNativeBuild" = true && "$pb_failed" == 0 ]]; then
ansible all -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -m raw -a "cd /vagrant/pbTestScripts && ./buildJDK.sh"
ansible all -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -m raw -a "cd /vagrant/pbTestScripts && ./buildJDK.sh $buildURL"
echo The build finished at : `date +%T`
if [[ "$runTest" = true ]]; then
ansible all -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -m raw -a "cd /vagrant/pbTestScripts && ./testJDK.sh"
Expand Down
1 change: 1 addition & 0 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/FreeBSD.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Build_Tool_Packages:
- libXtst
- openjdk
- openjdk8
- openjdk11
- pkgconf
- png
- unzip
Expand Down