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

pbTests: Build bisheng as a test for RISC-V #2090

Closed
wants to merge 3 commits into from
Closed

pbTests: Build bisheng as a test for RISC-V #2090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f344724
pbTests: Build bisheng as a test for RISC-V
Mar 28, 2021
ccc5818
pbTests: Updates following review to allow additional Bisheng parameters
sxa Jun 21, 2021
5f3e74c
Merge branch 'master' into qpc_riscv_bisheng
sxa Jun 21, 2021
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
13 changes: 9 additions & 4 deletions ansible/pbTestScripts/qemuPlaybookCheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,15 @@ defaultVars() {
exit 1;
fi
if [[ "$buildJDK" == true && "$ARCHITECTURE" == "RISCV" ]]; then
echo "Currently unable to build a JDK on RISC-V natively"
echo "Skipping build/test"
buildJDK=false
testJDK=false
if [ "$buildVariant" = "hotspot" ]; then
echo "Cannot build the main hotspot directly on RISC-V so selecting Bisheng variant"
buildVariant=bisheng
else
echo "Currently unable to build a JDK on RISC-V natively"
echo "Skipping build/test"
buildJDK=false
testJDK=false
fi
fi

}
Expand Down
7 changes: 5 additions & 2 deletions ansible/pbTestScripts/vagrantPlaybookCheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ fastMode=false
skipFullSetup=''
jdkToBuild=''
buildHotspot=''
buildBisheng=''
testDocker=false
scriptPath=$(realpath $0)

Expand Down Expand Up @@ -56,6 +57,8 @@ processArgs()
buildBranch="--branch $1"; shift;;
"--build-hotspot" )
buildHotspot="--hotspot";;
"--build-bisheng" )
buildBisheng="--bisheng";;
"--test-docker" )
testDocker=true;;
"--help" | "-h" )
Expand All @@ -76,6 +79,7 @@ usage()
--build-fork | -bf Specify the fork of openjdk-build to build from (Default: adoptopenjdk)
--build-branch | -bb Specify the branch of the fork to build from (Default: master)
--build-hotspot Build the JDK with Hotspot (Default: OpenJ9)
--build-bisheng Build the JDK with Bisheng (Default: OpenJ9)
--clean-workspace | -c Remove the old work folder if detected
--fork | -f Specify the fork of openjdk-infrastructure to run the playbook from (Default: adoptopenjdk)
--branch | -br Specify the branch of the infrastructure fork (Default: master)
Expand Down Expand Up @@ -245,8 +249,7 @@ startVMPlaybook()

if [[ "$testNativeBuild" = true ]]; then
local buildLogPath="$WORKSPACE/adoptopenjdkPBTests/logFiles/${gitFork}.${gitBranch}.$OS.build_log"

ssh -p ${vagrantPORT} $ssh_args -i $PWD/id_rsa [email protected] "cd /vagrant/pbTestScripts && bash buildJDK.sh $buildBranch $buildFork $jdkToBuild $buildHotspot" 2>&1 | tee $buildLogPath
ssh -p ${vagrantPORT} $ssh_args -i $PWD/id_rsa [email protected] "cd /vagrant/pbTestScripts && bash buildJDK.sh $buildBranch $buildFork $jdkToBuild $buildHotspot $buildBisheng" 2>&1 | tee $buildLogPath
echo The build finished at : `date +%T`
if grep -q '] Error' $buildLogPath || grep -q 'configure: error' $buildLogPath; then
echo BUILD FAILED
Expand Down