From 7ecb6d1f96cd9f9c723eba2464e352884eab49ff Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 23 Nov 2021 17:43:55 +1000 Subject: [PATCH] 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 Change-Id: I0ab9ee5e6185400ff36da84e5ad48c53beafb20d --- jjb/dluxapps/dluxapps.yaml | 2 +- jjb/netconf/netconf.yaml | 2 +- jjb/p4plugin/p4plugin.yaml | 6 +++--- jjb/plastic/plastic.yaml | 2 +- jjb/releng-templates-java.yaml | 36 ---------------------------------- jjb/sxp/sxp.yaml | 2 +- 6 files changed, 7 insertions(+), 43 deletions(-) diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 2f4b24208..dff786c0b 100644 --- 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 db43ae95c..f84cd9256 100644 --- 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 cdee1905f..7bd3b90a5 100644 --- 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 3ca1e130a..8b9a04ef7 100644 --- 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 832db0cc3..12ffe0eb2 100644 --- 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 0c1a62923..f6b1c583d 100644 --- 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" -- 2.36.6