diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2016-09-08 23:27:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-09-08 23:27:59 +0000 |
| commit | d2cb1de661a87079cbde99f4f7a709a1c5760372 (patch) | |
| tree | aa18c3f7f2262eddbb933afa118cfbdb4a3a500c /jjb | |
| parent | 7a18d018cdfabdb285911aaf2770c3af8d10df32 (diff) | |
| parent | e7bb7ba1cb0f0bc040a2cd085f52636843a0e706 (diff) | |
Merge "Fix JAVA env variables for pushing packages"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh index c92db08cb..74dccf118 100644 --- a/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh +++ b/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh @@ -1,8 +1,10 @@ #!/bin/bash # basic build script example set -e -o pipefail - if [ "${OS}" == "ubuntu1404" ]; then + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ + export JAVAC=${JAVA_HOME}/bin/javac + export PATH=${JAVA_HOME}/bin/:${PATH} cd nsh-plugin/build/java/jvpp $MVN deploy \ -gs $GLOBAL_SETTINGS_FILE -s $SETTINGS_FILE |