Fix cloud-infra-periodic job build job macros

Change-Id: Ia83660b1a5bf9619bb2a9d077dabe056ebafb3f9

diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 9565febda867c02b6bb7519a45a29fff52768309..cbf2f14cd9dae32b24d3af542f93a1dc56a5ea85 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -267,7 +267,7 @@
           refspec: ''
 
     builders:
-      - 'cloud-infra-periodic-test-macro'
+      - 'cloud-infra-periodic-{phase}-macro'
 
 # -------------------------------
 # builder macros
@@ -282,7 +282,15 @@
           !include-raw: ./cloud-infra-deploy.sh
 
 - builder:
-    name: 'cloud-infra-periodic-test-macro'
+    name: 'cloud-infra-periodic-functest-macro'
+    builders:
+      - shell:
+          !include-raw: ./prepare-for-test.sh
+      - shell:
+          !include-raw: ./cloud-infra-test.sh
+
+- builder:
+    name: 'cloud-infra-periodic-yardstick-macro'
     builders:
       - shell:
           !include-raw: ./prepare-for-test.sh