Fix jobs for nonrtric-o-ru-closed-loop-recovery

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

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 696c574..b346150 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -141,6 +141,37 @@
 
 - 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
@@ -167,23 +198,3 @@
       - 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