From f2b97c7ac5e46c2e691230b3a7f659e8e036bf80 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Fri, 11 Jul 2025 15:14:12 -0700 Subject: [PATCH 01/16] Switch all cattle to sjc flavors The issue we had before was with hardware name-to-ID mappings being different for SJC. We have included these in the latest version of global-jjb as "-sjc" flavors, which will correctly map to the IDs of these nodes in SJC. Signed-off-by: Eric Ball Change-Id: I464e025692336c3bc034b56a0b504442a4b8316a --- jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/cloud.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg | 2 +- jenkins-config/clouds/openstack/cattle/ubuntu2204-devstack-4c-16g.cfg | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg index 3ba1f3b5..5f12e7be 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-builder-1c-1g IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20240201-210113.228 -HARDWARE_ID=v2-highcpu-1 +HARDWARE_ID=v3-starter-1-sjc VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg index d43b448a..236f382c 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-docker-2c-8g-200g IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20240207-020748.713 -HARDWARE_ID=v2-standard-2 +HARDWARE_ID=v3-standard-2-sjc VOLUME_SIZE=200 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg index a8c7f6be..99409ecf 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-docker-2c-8g IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20240207-020748.713 -HARDWARE_ID=v2-standard-2 +HARDWARE_ID=v3-standard-2-sjc VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg index 37ebec5a..77421478 100644 --- a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-4g.cfg @@ -1,4 +1,4 @@ LABELS=centos8-builder-2c-4g IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20240101-220121.191 VOLUME_SIZE=20 -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-starter-2-sjc diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index 2a5ddafb..65f210eb 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -7,7 +7,7 @@ CLOUD_ZONE=sjc1 # Default Template Configuration IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230501-210122.874 VOLUME_SIZE=20 -HARDWARE_ID=v2-highcpu-1 +HARDWARE_ID=v3-starter-1-sjc NETWORK_ID=b9e029b4-9b35-4a83-a4e6-c820eb00c3ec USER_DATA_ID=jenkins-init-script INSTANCE_CAP=10 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg index 624f3f6c..2880f442 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-builder-2c-2g IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20240101-050208.546 -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-starter-2-sjc VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg index 17f89066..ce4c50c3 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-builder-4c-4g IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220920-114402.749 -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-starter-4-sjc VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg index 3142ebd0..614a1372 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu1804-docker-4c-4g IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240207-020748.956 -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-starter-4-sjc VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg index fcf6ea65..ddb0e788 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-2c-2g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu2004-builder-2c-2g IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20240101-020156.263 -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-starter-2-sjc VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg index 445d6ec7..a50051dc 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg @@ -1,4 +1,4 @@ LABELS=ubuntu2004-builder-4c-4g IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20240101-020156.263 -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-starter-4-sjc VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg index 5761a5b4..229ce4d9 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg @@ -1,3 +1,3 @@ LABELS=ubuntu2004-devstack-4c-16g IMAGE_NAME=ZZCI - Ubuntu 20.04 - devstack - x86_64 - 20230913-095841.255 -HARDWARE_ID=v2-standard-4 +HARDWARE_ID=v3-standard-4-sjc diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2204-devstack-4c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2204-devstack-4c-16g.cfg index 9fde84ce..3da924b6 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu2204-devstack-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2204-devstack-4c-16g.cfg @@ -1,3 +1,3 @@ LABELS=ubuntu2204-devstack-4c-16g IMAGE_NAME=ZZCI - Ubuntu 22.04 - devstack - x86_64 - 20231031-095146.118 -HARDWARE_ID=v2-standard-4 +HARDWARE_ID=v3-standard-4-sjc -- 2.16.6 From a8945dc8f2b65cdcf3e496a079166ef53b8e8871 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Thu, 7 Aug 2025 15:03:39 +0100 Subject: [PATCH 02/16] Remove Standalone NONRTRIC verify jobs NONRTRIC charts are available as part of smo-install and the standalone NONRTRIC charts are removed. This removes the job which verifies the standalone NONRTRIC repository. Issue-ID: NONRTRIC-1082 Change-Id: I0a4a0e150dc3febd800047a1cec3717d4cbeaee7 Signed-off-by: aravind.est --- jjb/it-dep/it-dep.yaml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/jjb/it-dep/it-dep.yaml b/jjb/it-dep/it-dep.yaml index ffaa1979..a445f8e9 100644 --- a/jjb/it-dep/it-dep.yaml +++ b/jjb/it-dep/it-dep.yaml @@ -39,30 +39,6 @@ - all: branch: "*" -- project: - <<: *it_dep_common - # Verify helm charts using a Docker build process. - # no image needs to be pushed, so there is no merge job. - name: it-dep-nonrtric-helm - # jenkins job name prefix - build-timeout: 120 - project-name: "{name}" - # image name - docker-name: "o-ran-sc/{name}" - # dockerfile is in subdir - docker-build-args: -f ci/Dockerfile-nonrtric-install - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: "nonrtric/.*" - # any tag will do - container-tag-method: latest - submodule-disable: true - jobs: - - gerrit-docker-verify - stream: - - all: - branch: "*" - - project: <<: *it_dep_common # Verify helm charts using a Docker build process. -- 2.16.6 From db066cea5449f4ea00796426efbbb3965bb94208 Mon Sep 17 00:00:00 2001 From: "Zhang Rong(Jon)" Date: Mon, 18 Aug 2025 16:27:38 +0800 Subject: [PATCH 03/16] Update I-release of pti-o2 repo Signed-off-by: Zhang Rong(Jon) Change-Id: Iff2fe81b0d222cc46e6b70bc5fc9c5cd27aab6b8 --- jjb/pti-o2/pti-o2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jjb/pti-o2/pti-o2.yaml b/jjb/pti-o2/pti-o2.yaml index cd7b00a2..7efad343 100644 --- a/jjb/pti-o2/pti-o2.yaml +++ b/jjb/pti-o2/pti-o2.yaml @@ -38,8 +38,6 @@ stream: - master: branch: master - - k-release: - branch: k-release - project: <<: *pti_o2_docker_common @@ -53,6 +51,8 @@ stream: - master: branch: master + - l-release: + branch: l-release - project: <<: *pti_o2_docker_common -- 2.16.6 From 6845302c3391b52c9741cde34adadf93c717ce86 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 27 Aug 2025 08:45:07 +1000 Subject: [PATCH 04/16] Chore: Update global-jjb to the latest v0.92.3 Change-Id: I452c70a110556fde2a7c6d7eb842df2b724c89fb Signed-off-by: Anil Belur --- global-jjb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global-jjb b/global-jjb index c05412b7..42c1d259 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit c05412b71ea0db6250094160bedc41da791cad3c +Subproject commit 42c1d2599c0e53dc6b138183220012386350187d -- 2.16.6 From ab78ea4dd16934f0ac88035f713b04d657ca2769 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Thu, 28 Aug 2025 14:42:54 +0100 Subject: [PATCH 05/16] Remove it-dep-helm and it-dep-smo-install ci jobs it-dep-helm and it-dep-smo-install jobs are migrated to github workflow as part of https://gerrit.o-ran-sc.org/r/c/it/dep/+/14817 and https://gerrit.o-ran-sc.org/r/c/it/dep/+/14844 Latest ci job can be viewed in Github here(https://github.com/o-ran-sc/it-dep/actions/workflows/gerrit-verify-itdep.yaml) Issue-ID: NONRTRIC-1076 Change-Id: I889bc5bfe87437e60036755c78f2d92f938558ef Signed-off-by: aravind.est --- jjb/it-dep/it-dep.yaml | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/jjb/it-dep/it-dep.yaml b/jjb/it-dep/it-dep.yaml index a445f8e9..d3b95812 100644 --- a/jjb/it-dep/it-dep.yaml +++ b/jjb/it-dep/it-dep.yaml @@ -18,48 +18,6 @@ # source of docker tag container-tag-method: yaml-file -- project: - <<: *it_dep_common - # Verify helm charts using a Docker build process. - # no image needs to be pushed, so there is no merge job. - name: it-dep-helm - # jenkins job name prefix - build-timeout: 120 - project-name: "{name}" - # image name - docker-name: "o-ran-sc/{name}" - # dockerfile is in subdir - docker-build-args: -f ci/Dockerfile - # any tag will do - container-tag-method: latest - submodule-disable: true - jobs: - - gerrit-docker-verify - stream: - - all: - branch: "*" - -- project: - <<: *it_dep_common - # Verify helm charts using a Docker build process. - # no image needs to be pushed, so there is no merge job. - name: it-dep-smo-install - # jenkins job name prefix - build-timeout: 120 - project-name: "{name}" - # image name - docker-name: "o-ran-sc/{name}" - # dockerfile is in subdir - docker-build-args: -f ci/Dockerfile-smo-install - # any tag will do - container-tag-method: latest - submodule-disable: true - jobs: - - gerrit-docker-verify - stream: - - all: - branch: "*" - # build and publish packages to PackageCloud.io - project: <<: *it_dep_common -- 2.16.6 From 73910591b9fcaafb01bac7b534dc316caad02b08 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Thu, 4 Sep 2025 16:44:24 +0100 Subject: [PATCH 06/16] NONRTRIC-ICS Upgrade maven version Maven version upgraded to 3.9 Issue-ID: INT-193 Change-Id: I17c2e4f513691b2c7e1ea8a16baae99141409165 Signed-off-by: aravind.est --- .../nonrtric-plt-informationcoordinatorservice.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml index 25c6181b..51941887 100644 --- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml +++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml @@ -14,7 +14,7 @@ project-name: nonrtric-plt-informationcoordinatorservice # maven settings file has docker credentials mvn-settings: nonrtric-plt-informationcoordinatorservice-settings - mvn-version: mvn36 + mvn-version: mvn39 java-version: openjdk17 - project: -- 2.16.6 From b25b465a0656a6098b2d9f2b256a68dd83b822a5 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Mon, 8 Sep 2025 12:40:28 +0100 Subject: [PATCH 07/16] NONRTRIC - InformationCoordinatorService - Allow release from older branch for bug-fix release Issue-ID: NONRTRIC-1095 Change-Id: I575f0907060bd2261fa7e698a536f3257afddc33 Signed-off-by: JohnKeeney --- .../nonrtric-plt-informationcoordinatorservice.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml index 51941887..a423b750 100644 --- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml +++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml @@ -63,6 +63,13 @@ build-node: centos7-docker-2c-8g jobs: - "{project-name}-gerrit-release-jobs" + stream: + - master: + branch: master + - i-release: + branch: i-release + - j-release: + branch: j-release - project: <<: *informationcoordinatorservice_jdk_common @@ -71,7 +78,6 @@ # template goal install builds docker image unnecessarily mvn-params: "-Ddocker.skip=true" sonarcloud: true - mvn-version: mvn39 sonarcloud-api-token: "{sonarcloud_api_token}" sonarcloud-project-key: "nonrtric-plt-informationcoordinatorservice" sonarcloud-project-organization: "{sonarcloud_project_organization}" -- 2.16.6 From 6e146274ee48c03cbc86179d3401ded7704653cc Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Mon, 15 Dec 2025 11:19:51 +0000 Subject: [PATCH 08/16] ci: smo/teiv: Add m-release jobs Issue-ID: SMO-192 Change-Id: Iec316b76d6e14fc7019d1bcb8b77d50d96510147 Signed-off-by: JohnKeeney --- jjb/smo-teiv/smo-teiv.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jjb/smo-teiv/smo-teiv.yaml b/jjb/smo-teiv/smo-teiv.yaml index 2de18ec2..1aa5d2f5 100644 --- a/jjb/smo-teiv/smo-teiv.yaml +++ b/jjb/smo-teiv/smo-teiv.yaml @@ -43,6 +43,8 @@ branch: k-release - l-release: branch: l-release + - m-release: + branch: m-release # smo:teiv/ # Maven artifacts for smo-teiv/ @@ -68,6 +70,8 @@ branch: k-release - l-release: branch: l-release + - m-release: + branch: m-release - project: <<: *smo_teiv_jdk_common -- 2.16.6 From 2d939c4452e3d250714400ffedba6bcc5b26ac6c Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Mon, 15 Dec 2025 18:21:33 +0000 Subject: [PATCH 09/16] ci: nonrtric-plt-a1policymanagementservice: Add m-release jobs Issue-ID: NONRTRIC-1095 Change-Id: I098eb925eeb94597b76816894149bc582e1c556f Signed-off-by: JohnKeeney --- .../nonrtric-plt-a1policymanagementservice.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml index d005142f..035ed825 100644 --- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml +++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml @@ -34,6 +34,8 @@ branch: k-release - l-release: branch: l-release + - m-release: + branch: m-release - project: <<: *a1policymanagementservice_jdk_common @@ -51,6 +53,8 @@ branch: k-release - l-release: branch: l-release + - m-release: + branch: m-release - project: <<: *a1policymanagementservice_jdk_common @@ -69,6 +73,8 @@ branch: k-release - l-release: branch: l-release + - m-release: + branch: m-release - project: <<: *a1policymanagementservice_jdk_common -- 2.16.6 From 489dc80af8381e6d17f7776fd292e97cf67a17a1 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Tue, 16 Dec 2025 10:01:42 +0000 Subject: [PATCH 10/16] ci: nonrtric-plt-rappmanager: consolidate release jobs Release jobs run twice so one is always unsucessful (because the other succeeded) Issue-ID: NONRTRIC-1095 Change-Id: I4ba632515bc6f0f7a78c38e5bf6a9face9a70f3c Signed-off-by: JohnKeeney --- .../nonrtric-plt-rappmanager.yaml | 31 ++++++++-------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml index 6cde252d..cb9c9910 100644 --- a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml +++ b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml @@ -43,6 +43,17 @@ - l-release: branch: l-release +- project: + <<: *rappmanager_jdk_common + name: nonrtric-plt-rappmanager-release + project-name: nonrtric-plt-rappmanager + # Job is common for the entire repo + # maven release requires sigul which requires centos + # container release requires docker + build-node: centos7-docker-2c-8g + jobs: + - "{project-name}-gerrit-release-jobs" + # nonrtric:rappmanager/ # Maven artifacts for nonrtric-plt-rappmanager/ - project: @@ -67,16 +78,6 @@ - l-release: branch: l-release -- project: - <<: *rappmanager_jdk_common - name: nonrtric-plt-rappmanager-release - project-name: nonrtric-plt-rappmanager - # maven release requires sigul which requires centos - # container release requires docker - build-node: centos7-docker-2c-8g - jobs: - - "{project-name}-gerrit-release-jobs" - - project: <<: *rappmanager_jdk_common name: nonrtric-plt-rappmanager-sonar @@ -146,16 +147,6 @@ - l-release: branch: l-release -- project: - <<: *acm_participants_jdk_common - name: nonrtric-plt-participants-release - project-name: nonrtric-plt-participants - # maven release requires sigul which requires centos - # container release requires docker - build-node: centos7-docker-2c-8g - jobs: - - "{project-name}-gerrit-release-jobs" - - project: <<: *acm_participants_jdk_common name: nonrtric-plt-participants-sonar -- 2.16.6 From 47c9d43664e482fba8b6d2ef3279b5eb4f05ffb7 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Tue, 16 Dec 2025 17:37:45 +0000 Subject: [PATCH 11/16] ci: nonrtric-plt-rappmanager: Add m-release jobs Issue-ID: NONRTRIC-1095 Change-Id: I462b9e09912724a621d4f2cbe4c69d1fa7d33743 Signed-off-by: JohnKeeney --- .../nonrtric-plt-rappmanager.yaml | 41 ++++++++++++++-------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml index cb9c9910..03d9773e 100644 --- a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml +++ b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml @@ -11,6 +11,7 @@ views: - project-view +# Common default parent for rAppManager & whole repo (but not participants) - _nonrtric_jdk_common: &rappmanager_jdk_common name: rappmanager-jdk-common # git repo @@ -26,6 +27,19 @@ java-version: openjdk17 jacoco-exclude-pattern: !include-raw-escape: coverage-exclude-pattern.txt +# Release jobs for whole repo +- project: + <<: *rappmanager_jdk_common + name: nonrtric-plt-rappmanager-release + project-name: nonrtric-plt-rappmanager + # Job is common for the entire repo + # maven release requires sigul which requires centos + # container release requires docker + build-node: centos7-docker-2c-8g + jobs: + - "{project-name}-gerrit-release-jobs" + +# Maven&docker for whole repo - project: <<: *rappmanager_jdk_common mvn-params: -Dbuild.number=${{BUILD_NUMBER}} @@ -42,19 +56,9 @@ branch: k-release - l-release: branch: l-release + - m-release: + branch: m-release -- project: - <<: *rappmanager_jdk_common - name: nonrtric-plt-rappmanager-release - project-name: nonrtric-plt-rappmanager - # Job is common for the entire repo - # maven release requires sigul which requires centos - # container release requires docker - build-node: centos7-docker-2c-8g - jobs: - - "{project-name}-gerrit-release-jobs" - -# nonrtric:rappmanager/ # Maven artifacts for nonrtric-plt-rappmanager/ - project: <<: *rappmanager_jdk_common @@ -77,7 +81,10 @@ branch: k-release - l-release: branch: l-release + - m-release: + branch: m-release +# Sonar for nonrtric-plt-rappmanager/ - project: <<: *rappmanager_jdk_common name: nonrtric-plt-rappmanager-sonar @@ -91,6 +98,7 @@ jobs: - gerrit-maven-sonar +# Common parent for participants - _nonrtric_jdk_common: &acm_participants_jdk_common name: acm_participants_jdk_common # git repo @@ -106,6 +114,7 @@ java-version: openjdk17 jacoco-exclude-pattern: !include-raw-escape: coverage-exclude-pattern-participants.txt +# Maven&docker for nonrtric-plt-participants - project: <<: *acm_participants_jdk_common project-name: nonrtric-plt-participants @@ -123,9 +132,10 @@ branch: k-release - l-release: branch: l-release + - m-release: + branch: m-release -# nonrtric:rappmanager/ -# Maven artifacts for nonrtric-plt-rappmanager/ +# Maven artifacts for nonrtric-plt-participants - project: <<: *acm_participants_jdk_common name: nonrtric-plt-participants @@ -146,7 +156,10 @@ branch: k-release - l-release: branch: l-release + - m-release: + branch: m-release +# Sonar for nonrtric-plt-participants - project: <<: *acm_participants_jdk_common name: nonrtric-plt-participants-sonar -- 2.16.6 From 674e5da1dfd8fc87d672a0cd4b6526123079327d Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Tue, 13 Jan 2026 21:09:22 -0800 Subject: [PATCH 12/16] Update global-jjb to v0.92.11 Signed-off-by: Eric Ball Change-Id: I43d35b7f5c95a21c6cb1f788d2a121bab912f5ff --- global-jjb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global-jjb b/global-jjb index 42c1d259..9a80001a 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 42c1d2599c0e53dc6b138183220012386350187d +Subproject commit 9a80001af1fb6efb6cbdb21340fc07a89c829005 -- 2.16.6 From affc204f736313205cd21e4b0b5a04555e3172aa Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Tue, 20 Jan 2026 15:38:13 -0800 Subject: [PATCH 13/16] Chore: Upgrade global-jjb to v0.92.12 This will bring in a fix for container release jobs. Signed-off-by: Eric Ball Change-Id: I77072c10c6ed9b0c2e09b9ea8c961d1ea299c880 --- global-jjb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global-jjb b/global-jjb index 9a80001a..67cf4368 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 9a80001af1fb6efb6cbdb21340fc07a89c829005 +Subproject commit 67cf4368dbfad0298eb917010e4e0726994de731 -- 2.16.6 From 0e34b4012a7e005ed4a20cc76a3783e0a7df6453 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Tue, 20 Jan 2026 17:26:54 -0800 Subject: [PATCH 14/16] Chore: Upgrade global-jjb to v0.92.13 Fixes bug in v0.92.12 changes Signed-off-by: Eric Ball Change-Id: I53c4045c639b51395c7066c9819d9fec3084a333 --- global-jjb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global-jjb b/global-jjb index 67cf4368..b1d355f2 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 67cf4368dbfad0298eb917010e4e0726994de731 +Subproject commit b1d355f26084d5b13226267796b33edf22bd786b -- 2.16.6 From a85835713ac37ebdddf776eb7772603d1f1f0bf0 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Wed, 11 Feb 2026 16:45:08 +0000 Subject: [PATCH 15/16] ci: nonrtric-plt-rappmanager: Add m-release jobs Issue-ID: NONRTRIC-1095 Change-Id: I1660cab0cf8afb5b8086562ef32548b1d2091357 Signed-off-by: JohnKeeney --- jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml index 03d9773e..7ceee5f3 100644 --- a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml +++ b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml @@ -38,6 +38,11 @@ build-node: centos7-docker-2c-8g jobs: - "{project-name}-gerrit-release-jobs" + stream: + - master: + branch: master + - m-release: + branch: m-release # Maven&docker for whole repo - project: -- 2.16.6 From 0f515fe81fce861092290e32cfe61c892a8beab7 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Wed, 11 Feb 2026 18:05:14 +0000 Subject: [PATCH 16/16] ci: nonrtric-plt-rappmanager: Fix staging jobs Issue-ID: NONRTRIC-1095 Change-Id: Ie88019cca47b107764556d62d712f8ba10567d66 Signed-off-by: JohnKeeney --- .../nonrtric-plt-rappmanager.yaml | 51 ++++++++++++++++++++-- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml index 7ceee5f3..b453c51a 100644 --- a/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml +++ b/jjb/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager.yaml @@ -72,11 +72,10 @@ mvn-opts: "-Ddocker.skip=true" build-node: ubuntu1804-docker-4c-4g jobs: - - gerrit-maven-stage - gerrit-maven-clm - gerrit-maven-verify - gerrit-maven-verify-dependencies - + - gerrit-maven-stage stream: - master: branch: master @@ -119,15 +118,60 @@ java-version: openjdk17 jacoco-exclude-pattern: !include-raw-escape: coverage-exclude-pattern-participants.txt +# Maven&docker stage jobs for participants (needs to be separate) +- project: + <<: *acm_participants_jdk_common + project-name: nonrtric-plt-participants-stage + mvn-params: "-Dbuild.number=${{BUILD_NUMBER}} -f participants" + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: ".*" + jobs: + - gerrit-maven-docker-stage + stream: + - master: + branch: master + - j-release: + branch: j-release + - k-release: + branch: k-release + - l-release: + branch: l-release + - m-release: + branch: m-release + +- project: + <<: *acm_participants_jdk_common + name: nonrtric-plt-participants-maven-stage + project-name: nonrtric-plt-participants + mvn-params: "-Ddocker.skip=true -f participants" + build-node: ubuntu1804-docker-4c-4g + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: ".*" + jobs: + - gerrit-maven-stage + stream: + - master: + branch: master + - j-release: + branch: j-release + - k-release: + branch: k-release + - l-release: + branch: l-release + - m-release: + branch: m-release + # Maven&docker for nonrtric-plt-participants - project: <<: *acm_participants_jdk_common + name: nonrtric-plt-participants-docker-stage project-name: nonrtric-plt-participants mvn-params: "-Dbuild.number=${{BUILD_NUMBER}} -f participants" jobs: - gerrit-maven-docker-verify - gerrit-maven-docker-merge - - gerrit-maven-docker-stage stream: - master: branch: master @@ -148,7 +192,6 @@ mvn-params: "-Ddocker.skip=true -f participants" build-node: ubuntu1804-docker-4c-4g jobs: - - gerrit-maven-stage - gerrit-maven-clm - gerrit-maven-verify - gerrit-maven-verify-dependencies -- 2.16.6