X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=8c8111858e9840b7e3eecc4e84f3c24d7849865a;hb=0fe8720e600cd0d9af41b6602bcaccfb12786ac4;hp=f350d35fa95d187fea57ab3ee3efcef94276c84d;hpb=076937df3f0f036c7fd8f84152a0a4cacb8ad978;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index f350d35f..8c811185 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- nonrtric_jdk_common: &nonrtric_jdk_common
+- _nonrtric_jdk_common: &nonrtric_jdk_common
     name: nonrtric-jdk-common
     # git repo
     project: nonrtric
@@ -22,48 +22,50 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
-# nonrtric:pm-pmlogger-influx
-# Maven artifacts for nonrtric:pm-pmlogger-influx
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-plt-pm-pmlogger-influx
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f pmlog -Dbuild.number=${{BUILD_NUMBER}}'
+    name: nonrtric-test-kafka-procon
+    project-name: "{name}"
+    # image name
+    docker-name: "kafka-procon"
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: "--network=host"
+    # Directory with Dockerfile
+    docker-root: "test/kafka-procon"
+    # Directory where go test should be run
+    # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'pmlog/.*'
-    build-node: ubuntu1804-builder-4c-4g
+        pattern: "test/kafka-procon/.*"
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
     jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      # Disable stage for now (Will move to another repo before release)     - gerrit-maven-stage
-      # Disable clm for now  (Will move to another repo before release)     - gerrit-maven-clm
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
 
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-test-kafka-procon
-    project-name: '{name}'
+    name: nonrtric-test-http-https-proxy
+    project-name: "{name}"
     # image name
-    docker-name: 'kafka-procon'
+    docker-name: "http-https-proxy"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'test/kafka-procon'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "test/http-https-proxy"
     # Directory where go test should be run
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/kafka-procon/.*'
+        pattern: "test/http-https-proxy/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -74,23 +76,21 @@
 
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-test-http-https-proxy
-    project-name: '{name}'
+    name: nonrtric-test-cr
+    project-name: "{name}"
     # image name
-    docker-name: 'http-https-proxy'
+    docker-name: "cr"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'test/http-https-proxy'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "test/cr"
     # Directory where go test should be run
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/http-https-proxy/.*'
+        pattern: "test/cr/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -101,23 +101,21 @@
 
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-test-cr
-    project-name: '{name}'
+    name: nonrtric-test-prodstub
+    project-name: "{name}"
     # image name
-    docker-name: 'cr'
+    docker-name: "prodstub"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'test/cr'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "test/prodstub"
     # Directory where go test should be run
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/cr/.*'
+        pattern: "test/prodstub/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -128,23 +126,21 @@
 
 - project:
     <<: *nonrtric_jdk_common
-    name: nonrtric-test-prodstub
-    project-name: '{name}'
+    name: nonrtric-test-servicestub
+    project-name: "{name}"
     # image name
-    docker-name: 'prodstub'
+    docker-name: "servicestub"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'test/prodstub'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "test/servicestub"
     # Directory where go test should be run
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/prodstub/.*'
+        pattern: "test/servicestub/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -156,22 +152,20 @@
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-test-mrstub
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'mrstub'
+    docker-name: "mrstub"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'test/mrstub'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "test/mrstub"
     # Directory where go test should be run
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'test/mrstub/.*'
+        pattern: "test/mrstub/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -183,33 +177,36 @@
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-plt-auth-token-fetch
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-plt-auth-token-fetch'
+    docker-name: "o-ran-sc/nonrtric-plt-auth-token-fetch"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'auth-token-fetch'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-root: "auth-token-fetch"
     # Directory where go test should be run
-    go-root: 'auth-token-fetch'
+    go-root: "auth-token-fetch"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'auth-token-fetch/.*'
+        pattern: "auth-token-fetch/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
     stream:
-      - all:
-          branch: '*'
+      - master:
+          branch: master
       - g-release:
+          java-version: openjdk11
           branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
 
 - project:
     <<: *nonrtric_jdk_common
@@ -222,7 +219,7 @@
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw: sonar-project.properties
+    sonar-properties: !include-raw-escape: sonar-project.properties
     jobs:
       - gerrit-sonar-prescan-script
 
@@ -233,4 +230,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"