diff options
| author |   C.J. Collier <cjcollier@linuxfoundation.org> | 2016-10-05 10:58:44 -0700 |
|---|---|---|
| committer | C.J. Collier <cjcollier@linuxfoundation.org> | 2016-10-05 10:58:44 -0700 |
| commit | 76fdf1db332061f51342e0b637fe9f5af25dd6fe (patch) | |
| tree | d80d6a9bba4872cb4f0dd67eaf3ff2bac08e4765 /jjb/honeycomb | |
| parent | a90bdbfa849a207ae59d09019a3c7f27dff17ec4 (diff) | |
Do not revert to java 7
* honeycomb-merge-master-ubuntu1404 needs java 8 for sonar
* the revert to java 7 happens prior to the sonar run
* we now throw the guest away after each use, so there is no need to
revert to java 7
Change-Id: I551a5a6d3da5eb9d38cc1f624ef547815a41931c
Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>
Diffstat (limited to 'jjb/honeycomb')
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index 30a4b0fc2..0638e03e8 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -72,10 +72,6 @@ global-settings: 'global-settings' global-settings-type: cfp - postbuilders: - - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64||echo 'ignoring failure';fi - publishers: - email-notification: email-prefix: '[honeycomb]' @@ -144,10 +140,6 @@ global-settings: 'global-settings' global-settings-type: cfp - postbuilders: - - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64||echo 'ignoring failure';fi - publishers: - email-notification: email-prefix: '[honeycomb]' @@ -283,9 +275,6 @@ !include-raw-escape: - ../scripts/maven_push_functions.sh - include-raw-honeycomb-pkg-push.sh - - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64||echo 'ignoring failure';fi - reporters: - findbugs |