X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-rappcatalogue%2Fnonrtric-plt-rappcatalogue.yaml;h=8bdd59dab035ec97deb9c3a2451c65bfdf586c43;hb=78ce966dfb4b3818a725d12b7e58d994e7518291;hp=2e194f1e33d5aa0cc4916c692795bb8a19a2266c;hpb=31f9173023e67326d2399104f166b98a81037a5b;p=ci-management.git

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index 2e194f1e..8bdd59da 100644
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -5,15 +5,7 @@
     views:
       - project-view
 
-- project:
-    name: nonrtric-plt-rappcatalogue-info
-    project: nonrtric/plt/rappcatalogue
-    project-name: nonrtric-plt-rappcatalogue
-    build-node: centos7-builder-1c-1g
-    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
@@ -35,19 +27,22 @@
       - 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
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-stage
@@ -56,11 +51,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
@@ -69,18 +67,18 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue-sonar
     project-name: nonrtric-plt-rappcatalogue
     # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true'
+    mvn-params: "-Ddocker.skip=true"
     sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: 'nonrtric_plt_rappcatalogue'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "nonrtric_plt_rappcatalogue"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
     jobs:
       - gerrit-maven-sonar
 
@@ -97,12 +95,16 @@
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'catalogue-enhanced/.*'
+        pattern: "catalogue-enhanced/.*"
     stream:
       - master:
           branch: master
       - g-release:
           branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
     jobs:
       - gerrit-tox-verify
 
@@ -111,25 +113,29 @@
     name: nonrtric-plt-rappcatalogue-enhanced
     project-name: nonrtric-plt-rappcatalogue-enhanced
     # image name
-    docker-name: 'o-ran-sc/nonrtric-plt-rappcatalogue-enhanced'
+    docker-name: "o-ran-sc/nonrtric-plt-rappcatalogue-enhanced"
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'catalogue-enhanced'
+    docker-root: "catalogue-enhanced"
     build-node: ubuntu1804-docker-4c-4g
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'catalogue-enhanced/.*'
+        pattern: "catalogue-enhanced/.*"
     stream:
       - master:
           branch: master
       - g-release:
           branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
 
 - project:
     <<: *rappcatalogue_jdk_common
@@ -142,17 +148,17 @@
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'catalogue-enhanced/.*'
+        pattern: "catalogue-enhanced/.*"
     sonar-project-file: ""
     sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=catalogue-enhanced/
-        sonar.python.coverage.reportPaths=catalogue-enhanced/coverage.xml
-        sonar.inclusions=catalogue-enhanced/src/**.py
-        sonar.exclusions=catalogue-enhanced/tests/**.py
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=catalogue-enhanced/
+      sonar.python.coverage.reportPaths=catalogue-enhanced/coverage.xml
+      sonar.inclusions=catalogue-enhanced/src/**.py
+      sonar.exclusions=catalogue-enhanced/tests/**.py
     jobs:
       - gerrit-tox-sonarqube