commit 234dc9243e14d27b848067145e11da7c86f02819
author Zack Williams <zdw@opennetworking.org> Fri Aug 30 17:03:57 2019 -0700
committer Zack Williams <zdw@opennetworking.org> Fri Aug 30 17:19:53 2019 -0700
tree 70f41677d94db54c4bc39fa42c01c89c33330b91
parent accfa34b0a59b3761176960a8270298c6bb36648

Parameterize the JDK distribution

Change-Id: Idcc0f9348ec257bc0382de68422af2b141cec413

jjb/maven.yaml

diff --git a/jjb/maven.yaml b/jjb/maven.yaml
index 522c107..3fe240f 100644
--- a/jjb/maven.yaml
+++ b/jjb/maven.yaml
@@ -22,6 +22,11 @@
          default: 'refs/heads/master'
          description: 'Use default when using "Build Now"'
 
+      - string:
+         name: jdkDistro
+         default: '{jdk-distribution}'
+         description: 'Distribution of the JDK to use with update-java-alternatives'
+
     triggers:
       - cord-infra-gerrit-trigger-patchset:
           gerrit-server-name: '{gerrit-server-name}'
@@ -53,6 +58,15 @@
       - inject:
           properties-content: |
             _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
+
+      - shell: |
+          #!/usr/bin/env bash
+          set -eu -o pipefail
+          echo "Setting JDK Distro to: $jdkDistro"
+          sudo update-java-alternatives -set "$jdkDistro"
+          echo "Java Version:"
+          java -version
+
       - maven-target:
           pom: pom.xml
           goals: 'clean install'
@@ -78,6 +92,11 @@
          default: 'refs/heads/master'
          description: 'Use default when using "Build Now"'
 
+      - string:
+         name: jdkDistro
+         default: '{jdk-distribution}'
+         description: 'Distribution of the JDK to use with update-java-alternatives'
+
     triggers:
       - cord-infra-gerrit-trigger-merge:
           gerrit-server-name: '{gerrit-server-name}'
@@ -104,6 +123,15 @@
       - inject:
           properties-content: |
             _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
+
+      - shell: |
+          #!/usr/bin/env bash
+          set -eu -o pipefail
+          echo "Setting JDK Distro to: $jdkDistro"
+          sudo update-java-alternatives -set "$jdkDistro"
+          echo "Java Version:"
+          java -version
+
       - maven-target:
           pom: pom.xml
           settings: onoscord-apps
@@ -117,6 +145,12 @@
       <!-- Managed by Jenkins Job Builder -->
       Created by {id} job-template from ci-management/jjb/maven.yaml
 
+    parameters:
+      - string:
+         name: jdkDistro
+         default: '{jdk-distribution}'
+         description: 'Distribution of the JDK to use with update-java-alternatives'
+
     triggers:
       - cord-infra-gerrit-trigger-patchset:
           gerrit-server-name: '{gerrit-server-name}'
@@ -158,6 +192,15 @@
       - inject:
           properties-content: |
             _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
+
+      - shell: |
+          #!/usr/bin/env bash
+          set -eu -o pipefail
+          echo "Setting JDK Distro to: $jdkDistro"
+          sudo update-java-alternatives -set "$jdkDistro"
+          echo "Java Version:"
+          java -version
+
       - maven-target:
           pom: pom.xml
           goals: 'test'