mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-15 17:31:31 +02:00
Code Issues Projects Releases Wiki Activity

Making stc-set-openjdk11 non-destructive.

Browse Source 
Change-Id: Icee7d34d3e00989e00a5b68a9d82dff7da1f6d96
This commit is contained in:
Thomas Vachuska 2018-12-14 15:59:56 -08:00
parent 654204c089
commit b74fef2841
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/dev/bin/cell-build
View File

@ -60,5 +60,5 @@ ssh -t -t $ONOS_USER@$OCN "
# Run the build (neutralizing known environment mutations in SSH sessions) # Run the build (neutralizing known environment mutations in SSH sessions)
set -e set -e
[ $noBuild = false ] && SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 bazel build onos [ $noBuild = false ] && SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 bazel build onos
[ $runTests = true ] && bazel query 'tests(//...)' | SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 xargs bazel test [ $runTests = true ] && bazel query 'tests(//...)' | SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 xargs bazel test || true
" "

2
tools/test/bin/stc-set-openjdk11
View File

@ -9,6 +9,6 @@ for node in $nodes; do
echo $node: echo $node:
ssh -n -o ConnectTimeout=3 -o PasswordAuthentication=no ${ONOS_USER}@$node " ssh -n -o ConnectTimeout=3 -o PasswordAuthentication=no ${ONOS_USER}@$node "
sudo update-java-alternatives -s java-1.11.0-openjdk-amd64 sudo update-java-alternatives -s java-1.11.0-openjdk-amd64
echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64' > .bash_aliases echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64' >> .bash_aliases
" "
done done