From: elinuxhenrik <henrik.b.andersson@est.tech>
Date: Mon, 13 Dec 2021 17:14:04 +0000 (+0100)
Subject: Add release of usecases for nonrtric
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=0e790381f37554287834a633880c9d4e33e3eca6;p=ci-management.git

Add release of usecases for nonrtric

Issue-ID: NONRTRIC-675
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: Ife7ff7ec702da0b86d75042bf5910e5f5c2f391f
---

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 3e3d9bf3..2c305119 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -177,56 +177,6 @@
       - dawn:
           branch: dawn
 
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-o-ru-closed-loop-recovery
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-recovery'
-    # 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/usecases/oruclosedlooprecovery/scriptversion/app'
-    # Limit build trigger to appropriate files
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    # Includes verify and merge jobs
-    jobs:
-      - "{project-name}-gerrit-docker-jobs"
-    stream:
-      - master:
-          branch: master
-      - dawn:
-          branch: dawn
-
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-o-ru-closed-loop-consumer
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-consumer'
-    # 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/usecases/oruclosedlooprecovery/goversion/'
-    # Limit build trigger to appropriate files
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'test/usecases/oruclosedlooprecovery/goversion/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    # Includes verify and merge jobs
-    jobs:
-      - "{project-name}-gerrit-docker-jobs"
-    stream:
-      - master:
-          branch: master
-
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-dmaap-mediator-producer-sonar
@@ -258,6 +208,55 @@
     jobs:
       - gerrit-sonar-prescan-script
 
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-sonar
+    project-name: '{name}'
+    # template goal install builds docker image unnecessarily
+    mvn-params: '-Ddocker.skip=true'
+    sonarcloud: true
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    jobs:
+      - gerrit-maven-sonar
+
+# Usecases
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-o-ru-closed-loop-recovery
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-recovery'
+    # 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/usecases/oruclosedlooprecovery/scriptversion/app'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
+      - dawn:
+          branch: dawn
+
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-o-ru-closed-loop-consumer-sonar
@@ -289,24 +288,3 @@
     jobs:
       - gerrit-sonar-prescan-script
 
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-release
-    # maven release requires sigul which requires centos
-    # container release requires docker
-    build-node: centos7-docker-2c-8g
-    jobs:
-      - '{project-name}-gerrit-release-jobs'
-
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-sonar
-    project-name: '{name}'
-    # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true'
-    sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    jobs:
-      - gerrit-maven-sonar