Merge "Add support for jdk11 in magnesium"

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index c8544707ac9092955e3d03ff7acd5bb9c66446b8..356241a779ba2b3dd06f98dbfe8e4c20ad9c3630 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -23,6 +23,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          java-version: openjdk11
           karaf-version: odl
       - sodium:
           branch: 'stable/sodium'
@@ -80,6 +81,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          java-version: openjdk11
           dependencies: >
               aaa-merge-{stream},
               bgpcep-merge-{stream},
@@ -177,6 +179,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          java-version: openjdk11
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
@@ -219,6 +222,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          java-version: openjdk11
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 57b1e50aa64a42d505e249777fd2df392577e4fc..7fc1f740de5cedbda9ddaaa99aeb080cefd9e682 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -28,7 +28,6 @@
     project-type: freestyle
     node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -77,6 +76,8 @@
 
     builders:
       - distribution-check-wipe
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - inject:
           properties-file: 'allowed_projects.txt'
       - distribution-check-build-project:
@@ -134,7 +135,6 @@
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
-    jdk: '{java-version}'
     disabled: '{disable-job}'
 
     properties:
@@ -171,6 +171,8 @@
       - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - maven-target:
           maven-version: mvn35
           pom: pom.xml
@@ -208,7 +210,6 @@
 
     project-type: maven
     node: 'centos7-builder-8c-8g'
-    jdk: '{java-version}'
     disabled: '{disable-job}'
 
     properties:
@@ -250,6 +251,8 @@
       - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-set-variables
       - distribute-build-url:
           path: '$KARAF_ARTIFACT/src/main/assembly'
@@ -308,7 +311,6 @@
     project-type: freestyle
     node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -353,6 +355,8 @@
 
     builders:
       - distribution-check-wipe
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - inject:
           properties-file: 'allowed_projects.txt'
       - distribution-check-build-project:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 1fda3ae235c09f303a06bae10b2d91f994eac817..6e3b28c3549fbb4e3ef9762a5bb824177e4e6d50 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1910,6 +1910,8 @@
     builders:
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - maven-target:
           maven-version: mvn35
           pom: '{project}/pom.xml'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 0c12996b8f335e0ee02e9840a4e0c14cff50a1c9..4a87cf4f3f354c3b1cecb35131ecf40acdf7bcf8 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -333,6 +333,8 @@
       - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - maven-target:
           maven-version: 'mvn35'
           pom: '$GERRIT_PROJECT/pom.xml'
@@ -388,7 +390,6 @@
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
-    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -460,6 +461,8 @@
       - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-distribution-settings'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-multipatch-builder
       - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml