Scrub infra templates and macros of ecomp

[ci-management.git] / jjb / global-templates-python.yaml

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 2ba9f7d..05f87cf 100644 (file)
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -21,11 +21,11 @@
     node: '{build-node}'
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -39,7 +39,7 @@
           choosing-strategy: 'gerrit'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -64,7 +64,7 @@
           tox
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
+#       - infra-shiplogs:
 #           maven-version: '{maven-version}'
 
 - job-template:
@@ -73,11 +73,11 @@
     node: 'ubuntu1604-docker-8c-8g'
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -91,7 +91,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -123,11 +123,11 @@
     node: 'ubuntu1604-docker-8c-8g'
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -151,7 +151,7 @@
           checkout-dir: '{checkout-dir2}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers: