Rename k8s peridoc jobs fro test results reporting

Change-Id: I872507a90798822171cf8f007fcd450965eccd3c

diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index a5e66f27ea5cb16e6799814c72a348659237ff8f..fcd12c209909c322b765e0d55e96bd0f693540be 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
@@ -51,6 +51,9 @@
       - centos7:
           disabled: 'true'
 
+    ci-loop:
+      - daily
+
     deploy-scenario:
       - k8-calico-nofeature:
           installer-type: kubespray
@@ -83,11 +86,11 @@
           build-timeout: 5
 
     jobs:
-      - '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
-      - 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
+      - '{deploy-scenario}-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
+      - 'scenario-{distro}-{phase}-{type}-{ci-loop}-{stream}'
 
 - job-template:
-    name: '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
+    name: '{deploy-scenario}-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
 
     project-type: multijob
 
@@ -174,7 +177,7 @@
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{distro}-deploy-{type}-{stream}'
+            - name: 'scenario-{distro}-deploy-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -191,7 +194,7 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{distro}-functest-{type}-{stream}'
+            - name: 'scenario-{distro}-functest-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -208,7 +211,7 @@
           name: yardstick
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{distro}-yardstick-{type}-{stream}'
+            - name: 'scenario-{distro}-yardstick-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -225,7 +228,7 @@
           name: promote
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{distro}-promote-{type}-{stream}'
+            - name: 'scenario-{distro}-promote-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -240,7 +243,7 @@
               abort-all-job: true
 
 - job-template:
-    name: 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
+    name: 'scenario-{distro}-{phase}-{type}-{ci-loop}-{stream}'
 
     disabled: false