CI!: Remove job group odl-maven-jobs

The job-group odl-maven-jobs is no longer required since
all projects have been moved to openjdk11.

The job-group is removed and the existing jobs are moved to
odl-maven-jobs-jdk11 which use openjdk11 as the default for
all job in the group.

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I0ab9ee5e6185400ff36da84e5ad48c53beafb20d

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index 2f4b2420831173c6ad15815a54d4bc505c359056..dff786c0bd10c6e6657e0a336cf4f0c35df43373 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -2,7 +2,7 @@
 - project:
     name: dluxapps-master
     jobs:
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: "dluxapps"

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index db43ae95cbfe57d76e4cc2179b73f688909f2d7a..f84cd92562386fc0598159018284dfa9ee2154d6 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -56,7 +56,7 @@
 - project:
     name: netconf-1.7.4.x
     jobs:
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: 1.7.4.x

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index cdee1905f08606636655fcc7fe40964ec737a8b5..7bd3b90a502c57d9901671a034bc30ab53f05c02 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -3,7 +3,7 @@
     name: p4plugin-sulfur
     jobs:
       - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: sulfur
@@ -22,7 +22,7 @@
     name: p4plugin-phosphorus
     jobs:
       - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: phosphorus
@@ -41,7 +41,7 @@
     name: p4plugin-silicon
     jobs:
       - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: silicon

diff --git a/jjb/plastic/plastic.yaml b/jjb/plastic/plastic.yaml
index 3ca1e130a8291327964abadd652fb4fae80e24b5..8b9a04ef7c0019f06aff977c984eed163ea52f39 100644 (file)
--- a/jjb/plastic/plastic.yaml
+++ b/jjb/plastic/plastic.yaml
@@ -9,7 +9,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-plastic/102307/
           rtd-token: 963a1745b909ae6a1eae01f814c4983d17fdd44c
       - gerrit-tox-verify
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: master

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 832db0cc39a7ba0bca9e3c64e5bcb649532576c5..12ffe0eb24407cc1b419da582c5f45aef797fcba 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -21,42 +21,6 @@
     java-version: openjdk11
     mvn-version: mvn35
 
-- job-group:
-    name: odl-maven-jobs
-
-    jobs:
-      - gerrit-maven-clm:
-          nexus-iq-namespace: odl-
-          nexus-iq-stage: release
-
-      # TODO: Figure out what's wrong with the gerrit-maven-merge job.
-      # - gerrit-maven-merge:
-      #     post_build_trigger:
-      #       - project:
-      #           - 'distribution-merge-{stream}'
-      #         condition: SUCCESS
-      #         trigger-with-no-params: true
-      - "{project-name}-merge-{stream}":
-          build-timeout: 180
-          mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
-          disable-job: "{disable-job}"
-
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          mvn-central: false
-          ossrh-profile-id: 6386ebbbf3a563
-          cron: ""
-
-      - gerrit-maven-mri-stage:
-          sign-artifacts: true
-          mvn-central: false
-          ossrh-profile-id: 6386ebbbf3a563
-          cron: ""
-
-    java-version: openjdk8
-    mvn-version: mvn35
-    disable-job: "{disable-job}"
-
 - job-group:
     name: odl-maven-verify-jobs
 

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 0c1a629239dcf9250fa68b53bfe68611ad3d4d98..f6b1c583d592515581cb4b53c0b914aa049c261c 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -7,7 +7,7 @@
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     java-version: "openjdk11"