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: Change URLs to run the playbook from #1156

Merged
merged 1 commit into from
Feb 20, 2020
Merged

pbTests: Change URLs to run the playbook from #1156

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
4 changes: 2 additions & 2 deletions ansible/pbTestScripts/qemu_test_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ done
runPlaybook() {
local workFolder="$WORKSPACE"/qemu_pbCheck

[[ ! -d "$workFolder/openjdk-infrastructure" ]] && git clone -b qemu https://github.com/Willsparker/openjdk-infrastructure "$workFolder"/openjdk-infrastructure
[[ ! -d "$workFolder/openjdk-infrastructure" ]] && git clone https://github.com/adoptopenjdk/openjdk-infrastructure "$workFolder"/openjdk-infrastructure
cd "$workFolder"/openjdk-infrastructure/ansible || exit 1;
ansible-playbook -i "localhost:$PORTNO," --private-key "$workFolder"/id_rsa -u linux -b --skip-tags adoptopenjdk,jenkins${skipFullSetup} playbooks/AdoptOpenJDK_Unix_Playbook/main.yml 2>&1 | tee "$workFolder"/logFiles/"$ARCHITECTURE".log
if grep -q 'failed=[1-9]\|unreachable=[1-9]' "$workFolder"/logFiles/"$ARCHITECTURE".log; then
Expand All @@ -181,7 +181,7 @@ runPlaybook() {
exit 1;
fi
if [[ "$buildJDK" == true ]]; then
ssh linux@localhost -p "$PORTNO" -i "$workFolder"/id_rsa "git clone -b qemu https://github.com/Willsparker/openjdk-infrastructure \$HOME/openjdk-infrastructure && \$HOME/openjdk-infrastructure/ansible/pbTestScripts/buildJDK.sh"
ssh linux@localhost -p "$PORTNO" -i "$workFolder"/id_rsa "git clone https://github.com/adoptopenjdk/openjdk-infrastructure \$HOME/openjdk-infrastructure && \$HOME/openjdk-infrastructure/ansible/pbTestScripts/buildJDK.sh"
if [[ "$testJDK" == true ]]; then
ssh linux@localhost -p "$PORTNO" -i "$workFolder"/id_rsa "\$HOME/openjdk-infrastructure/ansible/pbTestScripts/testJDK.sh"
fi
Expand Down