From 9199e5585cc3cbb679f6d3f72a5e3d3aa05759f6 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Thu, 15 Jun 2023 00:23:21 +0100 Subject: [PATCH] O-RAN-SC NONRTRIC - Add jenkins jobs for H-Release Issue-ID: NONRTRIC-883 Change-Id: I59848e3d9173a77376c78b5c414ef9d15f84167d Signed-off-by: JohnKeeney --- .../nonrtric-plt-a1policymanagementservice.yaml | 10 ++++------ jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml | 10 ++++------ .../nonrtric-plt-dmaapmediatorproducer.yaml | 4 ++-- jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml | 6 ++++++ .../nonrtric-plt-informationcoordinatorservice.yaml | 10 ++++------ jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml | 8 ++++++++ jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml | 10 ++++++++++ jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml | 2 ++ jjb/nonrtric/nonrtric.yaml | 5 ++--- .../portal-nonrtric-controlpanel.yaml | 6 ++++++ jjb/sim-a1-interface/sim-a1-interface.yaml | 4 ++-- 11 files changed, 50 insertions(+), 25 deletions(-) diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml index 5e9e9364..14caea31 100644 --- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml +++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml @@ -34,12 +34,11 @@ stream: - master: branch: master - - f-release: - java-version: openjdk11 - branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release # nonrtric:a1policymanagementservice/ # Maven artifacts for nonrtric-plt-a1policymanagementservice/ @@ -55,12 +54,11 @@ stream: - master: branch: master - - f-release: - java-version: openjdk11 - branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release - project: <<: *a1policymanagementservice_jdk_common diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml index 71b8f811..83a0d0b7 100644 --- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml +++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml @@ -34,12 +34,11 @@ stream: - master: branch: master - - f-release: - java-version: openjdk11 - branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release # nonrtric:dmaapadapter/ # Maven artifacts for nonrtric-plt-dmaapadapter/ @@ -55,12 +54,11 @@ stream: - master: branch: master - - f-release: - java-version: openjdk11 - branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release - project: <<: *dmaapadapter_jdk_common diff --git a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml index 33355407..91a3cc36 100644 --- a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml +++ b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml @@ -53,10 +53,10 @@ stream: - master: branch: master - - f-release: - branch: f-release - g-release: branch: g-release + - h-release: + branch: h-release - project: <<: *dmaapmediatorproducer_common diff --git a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml index d3fccb1b..966eaae6 100644 --- a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml +++ b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml @@ -35,11 +35,14 @@ - master: branch: master - f-release: + # keep f release jobs for now since that is the last release java-version: openjdk11 branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release # nonrtric:helmmanager # Maven artifacts for helmmanager @@ -56,11 +59,14 @@ - master: branch: master - f-release: + # keep f release jobs for now since that is the last release java-version: openjdk11 branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release - project: <<: *helmmanager_jdk_common diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml index 94fb15db..a03f5b6f 100644 --- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml +++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml @@ -35,12 +35,11 @@ stream: - master: branch: master - - f-release: - java-version: openjdk11 - branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release # nonrtric:informationcoordinatorservice # Maven artifacts for nonrtric-plt-informationcoordinatorservice @@ -56,12 +55,11 @@ stream: - master: branch: master - - f-release: - java-version: openjdk11 - branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release - project: <<: *informationcoordinatorservice_jdk_common diff --git a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml index 7e52fbd9..5fb7a805 100644 --- a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml +++ b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml @@ -54,6 +54,8 @@ stream: - master: branch: master + - h-release: + branch: h-release # Jobs for nonrtric-plt-ranpm-pmproducer - project: @@ -74,6 +76,8 @@ stream: - master: branch: master + - h-release: + branch: h-release # Jobs for nonrtric-plt-ranpm-influxlogger - project: @@ -94,6 +98,8 @@ stream: - master: branch: master + - h-release: + branch: h-release - project: <<: *nonrtric_plt_ranpm_jdk_common @@ -120,3 +126,5 @@ stream: - master: branch: master + - h-release: + branch: h-release diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml index 182fad7e..d6498520 100644 --- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml +++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml @@ -35,11 +35,14 @@ - master: branch: master - f-release: + # will keep f release for now since that is the previous release java-version: openjdk11 branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release # nonrtric:rappcatalogue # Maven artifacts for rappcatalogue @@ -56,11 +59,14 @@ - master: branch: master - f-release: + # will keep f release for now since that is the previous release java-version: openjdk11 branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release - project: <<: *rappcatalogue_jdk_common @@ -103,6 +109,8 @@ branch: master - g-release: branch: g-release + - h-release: + branch: h-release jobs: - gerrit-tox-verify @@ -128,6 +136,8 @@ branch: master - g-release: branch: g-release + - h-release: + branch: h-release jobs: - "{project-name}-gerrit-docker-jobs" diff --git a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml index c38271cb..6f952b46 100644 --- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml +++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml @@ -66,6 +66,8 @@ branch: master - g-release: branch: g-release + - h-release: + branch: h-release - project: <<: *nonrtric_plt_sme_common diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 285faff9..633d6e1a 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -175,12 +175,11 @@ stream: - master: branch: master - - f-release: - java-version: openjdk11 - branch: f-release - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release - project: <<: *nonrtric_jdk_common diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml index b77b5e4a..dcc3aa40 100644 --- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml +++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml @@ -55,6 +55,8 @@ - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release - project: <<: *portal_nonrtric_controlpanel_common @@ -113,6 +115,8 @@ - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release - project: <<: *portal_nonrtric_controlpanel_common @@ -135,3 +139,5 @@ - g-release: java-version: openjdk11 branch: g-release + - h-release: + branch: h-release diff --git a/jjb/sim-a1-interface/sim-a1-interface.yaml b/jjb/sim-a1-interface/sim-a1-interface.yaml index 310d0921..a9674fcb 100644 --- a/jjb/sim-a1-interface/sim-a1-interface.yaml +++ b/jjb/sim-a1-interface/sim-a1-interface.yaml @@ -37,10 +37,10 @@ stream: - master: branch: master - - f-release: - branch: f-release - g-release: branch: g-release + - h-release: + branch: h-release jobs: - "{project-name}-gerrit-docker-jobs" -- 2.16.6