Gather macros used by jobs in same file

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-verify-testfw.yaml

diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
index c4c26cdf25a4d997bcaf83624cfb9508bcd8c30c..fbad9e8b2dcbb45187eb4f321f89d181dae7394b 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
@@ -225,16 +225,6 @@
           refspec: $GERRIT_REFSPEC
 
     builders:
-      - 'cloud-infra-verify-testfw-macro'
-
-# -------------------------------
-# builder macros
-# -------------------------------
-
-- builder:
-    name: 'cloud-infra-verify-testfw-macro'
-    builders:
-      - shell:
-          !include-raw: ./cloud-infra-test.sh
+      - 'cloud-infra-testfw-macro'
 
 # vim: set ts=2 sw=2 expandtab: