From d8dfdf8d8b8dac02f60ef145becfb4e6fed7ffb2 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Tue, 3 Jan 2023 14:52:58 +0100 Subject: [PATCH] Add g-release branch to nonrtric jobs Issue-ID: NONRTRIC-819 Signed-off-by: elinuxhenrik Change-Id: I96a8c311106ab30ded391ff1031aa49e0c609105 --- .../nonrtric-plt-a1policymanagementservice.yaml | 4 ++++ jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml | 4 ++++ .../nonrtric-plt-dmaapmediatorproducer.yaml | 2 ++ jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml | 4 ++++ .../nonrtric-plt-informationcoordinatorservice.yaml | 4 ++++ jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml | 6 ++++++ jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml | 2 ++ jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml | 4 ++++ .../nonrtric-rapp-ransliceassurance.yaml | 4 ++++ jjb/nonrtric/nonrtric.yaml | 2 ++ .../portal-nonrtric-controlpanel.yaml | 6 ++++++ jjb/sim-a1-interface/sim-a1-interface.yaml | 9 +++------ 12 files changed, 45 insertions(+), 6 deletions(-) diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml index b2ea3a57..70a6cfda 100644 --- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml +++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml @@ -36,6 +36,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release # nonrtric:a1policymanagementservice/ # Maven artifacts for nonrtric-plt-a1policymanagementservice/ @@ -53,6 +55,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-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 e6ed20f4..6dc595a0 100644 --- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml +++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml @@ -36,6 +36,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release # nonrtric:dmaapadapter/ # Maven artifacts for nonrtric-plt-dmaapadapter/ @@ -53,6 +55,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-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 679799d7..b3af76a7 100644 --- a/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml +++ b/jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml @@ -55,6 +55,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-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 c88df2c7..631c5b09 100644 --- a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml +++ b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml @@ -36,6 +36,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release # nonrtric:helmmanager # Maven artifacts for helmmanager @@ -53,6 +55,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-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 d46b50fb..4023b3fb 100644 --- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml +++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml @@ -36,6 +36,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release # nonrtric:informationcoordinatorservice # Maven artifacts for nonrtric-plt-informationcoordinatorservice @@ -53,6 +55,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release - project: <<: *informationcoordinatorservice_jdk_common diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml index 1ee52ba0..32407f2b 100644 --- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml +++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml @@ -36,6 +36,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release # nonrtric:rappcatalogue # Maven artifacts for rappcatalogue @@ -53,6 +55,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release - project: <<: *rappcatalogue_jdk_common @@ -116,6 +120,8 @@ stream: - master: branch: master + - g-release: + branch: g-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 e87bbdb9..9a7c5993 100644 --- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml +++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml @@ -64,6 +64,8 @@ stream: - master: branch: master + - g-release: + branch: g-release - project: <<: *nonrtric_plt_sme_common diff --git a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml index 2b6e8054..bc1c6b26 100644 --- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml +++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml @@ -49,6 +49,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release - project: <<: *orufhrecovery_common @@ -78,6 +80,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release - project: <<: *orufhrecovery_common diff --git a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml index c36a841b..2459b369 100644 --- a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml +++ b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml @@ -55,6 +55,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release - project: <<: *ransliceassurance_common @@ -80,6 +82,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release - project: <<: *ransliceassurance_common diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index b81b607b..bfdf94bc 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -130,6 +130,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-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 1c9b831c..efabbb2f 100644 --- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml +++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml @@ -56,6 +56,8 @@ branch: dawn - e-release: branch: e-release + - g-release: + branch: g-release - project: <<: *portal_nonrtric_controlpanel_common @@ -115,6 +117,8 @@ branch: dawn - e-release: branch: e-release + - g-release: + branch: g-release - project: <<: *portal_nonrtric_controlpanel_common @@ -138,4 +142,6 @@ branch: dawn - e-release: branch: e-release + - g-release: + branch: g-release diff --git a/jjb/sim-a1-interface/sim-a1-interface.yaml b/jjb/sim-a1-interface/sim-a1-interface.yaml index 0cb1be6f..ab3d017b 100644 --- a/jjb/sim-a1-interface/sim-a1-interface.yaml +++ b/jjb/sim-a1-interface/sim-a1-interface.yaml @@ -39,6 +39,8 @@ branch: master - f-release: branch: f-release + - g-release: + branch: g-release jobs: - '{project-name}-gerrit-docker-jobs' @@ -66,10 +68,5 @@ # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g - stream: - - master: - branch: master - - f-release: - branch: f-release jobs: - - '{project-name}-gerrit-release-jobs' \ No newline at end of file + - '{project-name}-gerrit-release-jobs' -- 2.16.6