Rename ONAP jobs so that the version could be reported correctly

Change-Id: I1196ceb52485835fe6ae32ca0c7598b275c79376

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 89c6d994572bb2a87b35342a8f603a5a61a9f3e9..8328d94298c84c703eec25909f253a1b19406e79 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -31,7 +31,7 @@
     onap-branch:
       - 'dublin':
           nordix-branch: master
-          onap-version: 4.0.0-ONAP
+          onap-version: dublin
           onap-flavor: full
           engine-version: master
           engine-refspec: master
@@ -54,6 +54,9 @@
     deploy-scenario:
       - onap-nofeature-noha
 
+    ci-loop:
+      - daily
+
     type:
       - cloud:
           provisioner-type: heat
@@ -84,12 +87,12 @@
           test-type: onap-healthcheck
 
     jobs:
-      - '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
-      - '{onap-other-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
-      - '{onap-healthcheck-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+      - '{deploy-scenario}-{onap-flavor}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+      - '{onap-other-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+      - '{onap-healthcheck-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
 
 - job-template:
-    name: '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+    name: '{deploy-scenario}-{onap-flavor}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
 
     project-type: multijob
 
@@ -175,7 +178,7 @@
           name: Deploy ONAP using OOM
           condition: ALWAYS
           projects:
-            - name: 'onap-deploy-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'onap-deploy-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -201,7 +204,7 @@
           name: K8S and OOM Healthcheck using xtesting
           condition: ALWAYS
           projects:
-            - name: 'oom-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'oom-healthcheck-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -227,7 +230,7 @@
           name: ONAP Healthcheck using xtesting
           condition: ALWAYS
           projects:
-            - name: 'onap-healthcheck-core-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'onap-healthcheck-core-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -250,7 +253,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-            - name: 'onap-healthcheck-small-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'onap-healthcheck-small-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -273,7 +276,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-            - name: 'onap-healthcheck-medium-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'onap-healthcheck-medium-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -296,7 +299,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-            - name: 'onap-healthcheck-full-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'onap-healthcheck-full-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -323,7 +326,7 @@
           name: Promote ONAP (not activated)
           condition: ALWAYS
           projects:
-            - name: 'promote-onap-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'promote-onap-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -361,7 +364,7 @@
                     !include-raw: ./delete-heat-stack.sh
 
 - job-template:
-    name: '{onap-other-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+    name: '{onap-other-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
 
     disabled: false
 
@@ -409,7 +412,7 @@
       - '{onap-other-phases}-macro'
 
 - job-template:
-    name: '{onap-healthcheck-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+    name: '{onap-healthcheck-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
 
     disabled: false