Refactor!: Update JJB code to comply with 5.x

[ci-management.git] / jjb / nonrtric-plt-rappcatalogue / nonrtric-plt-rappcatalogue.yaml

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index 1ee52ba..fe4c965 100644 (file)
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- rappcatalogue_jdk_common: &rappcatalogue_jdk_common
+- _rappcatalogue_jdk_common: &rappcatalogue_jdk_common
     name: rappcatalogue-jdk-common
     # git repo
     project: nonrtric/plt/rappcatalogue
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-rappcatalogue-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -35,7 +35,11 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 # nonrtric:rappcatalogue
 # Maven artifacts for rappcatalogue
@@ -52,7 +56,11 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -78,7 +86,8 @@
 
 - project:
     <<: *rappcatalogue_jdk_common
-    name: nonrtric-plt-enhanced-rappcatalogue-verify
+    name: nonrtric-plt-rappcatalogue-enhanced-verify
+    project-name: nonrtric-plt-rappcatalogue-enhanced
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
     python-version: python3.8
@@ -90,16 +99,17 @@
       - compare-type: REG_EXP
         pattern: 'catalogue-enhanced/.*'
     stream:
-      # run verify on all branches
-      # the ANT pattern is **/{branch}, we are exploiting that.
-      - all:
-          branch: '*'
+      - master:
+          branch: master
+      - g-release:
+          branch: g-release
     jobs:
       - gerrit-tox-verify
 
 - project:
     <<: *rappcatalogue_jdk_common
-    name: nonrtric-plt-rappcatalogue-enhanced-docker
+    name: nonrtric-plt-rappcatalogue-enhanced
+    project-name: nonrtric-plt-rappcatalogue-enhanced
     # image name
     docker-name: 'o-ran-sc/nonrtric-plt-rappcatalogue-enhanced'
     # source of docker tag
@@ -116,12 +126,15 @@
     stream:
       - master:
           branch: master
+      - g-release:
+          branch: g-release
     jobs:
       - '{project-name}-gerrit-docker-jobs'
 
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue-enhanced-sonarqube
+    project-name: nonrtric-plt-rappcatalogue-enhanced
     python-version: python3
     tox-dir: catalogue-enhanced
     # the install script assumes an ubuntu image