Use common phase jobs for scenario periodic jobs

Change-Id: I4dd1c6eaee69f8790bcf82b9405edfbf37bf3dd4

diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index 354b54db5ae929054ab6d2f3ea60eea78bfc3bb2..537fe292eaaf247a83e0be314c60e7c5ea691837 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
@@ -90,7 +90,7 @@
 
     jobs:
       - '{deploy-scenario}-periodic-{os}-{type}-{stream}'
-      - '{deploy-scenario}-periodic-{os}-{phase}-{type}-{stream}'
+      - 'scenario-periodic-{os}-{phase}-{type}-{stream}'
 
 - job-template:
     name: '{deploy-scenario}-periodic-{os}-{type}-{stream}'
@@ -189,7 +189,7 @@
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: '{deploy-scenario}-periodic-{os}-deploy-{type}-{stream}'
+            - name: 'scenario-periodic-{os}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
@@ -209,7 +209,7 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: '{deploy-scenario}-periodic-{os}-functest-{type}-{stream}'
+            - name: 'scenario-periodic-{os}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
@@ -226,7 +226,7 @@
           name: yardstick
           condition: SUCCESSFUL
           projects:
-            - name: '{deploy-scenario}-periodic-{os}-yardstick-{type}-{stream}'
+            - name: 'scenario-periodic-{os}-yardstick-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
@@ -243,7 +243,7 @@
           name: promote
           condition: SUCCESSFUL
           projects:
-            - name: '{deploy-scenario}-periodic-{os}-promote-{type}-{stream}'
+            - name: 'scenario-periodic-{os}-promote-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
@@ -258,7 +258,7 @@
               abort-all-job: true
 
 - job-template:
-    name: '{deploy-scenario}-periodic-{os}-{phase}-{type}-{stream}'
+    name: 'scenario-periodic-{os}-{phase}-{type}-{stream}'
 
     disabled: false