Restore jobs nonrtric-o-ru-closed-loop-recovery

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

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index b346150..0f8506e 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -141,37 +141,6 @@
 
 - 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
-    # 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}_{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    jobs:
-      - gerrit-maven-sonar
-
-- use_case_common: &use_case_common
-    # values apply to all use case projects
-    name: use-case-common
-    # git repo
-    project: nonrtric
-    # jenkins job name prefix
-    project-name: nonrtric-use-case
-    # maven settings file has docker credentials
-    mvn-settings: nonrtric-settings
-
-- project:
-    <<: *use_case_common
     name: nonrtric-o-ru-closed-loop-recovery
     project-name: '{name}'
     # image name
@@ -187,14 +156,32 @@
       - compare-type: REG_EXP
         pattern: 'test/usecases/oruclosedlooprecovery/scriptversion/app/.*'
     build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
     jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
       - dawn:
           branch: dawn
 
+- 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
+    # 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}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    jobs:
+      - gerrit-maven-sonar