Scrub infra templates and macros of ecomp

Change-Id: I1f7c6e89ee67710f77ff22d219c28adc2a9cee72
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 50f45be..3c76c19 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -34,11 +34,11 @@
     concurrent: true
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: 14
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: 'master'
           refspec: 'refs/heads/master'
@@ -50,7 +50,7 @@
           choosing-strategy: 'gerrit'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -76,7 +76,7 @@
       - ci-management-check-unicode
 
 #     publishers:
-#       - ecomp-infra-shiplogs
+#       - infra-shiplogs
 
 - job-template:
     name: '{project}-merge-jjb'
@@ -85,11 +85,11 @@
     node: '{build-node}'
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: 14
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: 'master'
           refspec: 'refs/heads/master'
@@ -101,7 +101,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -125,7 +125,7 @@
           jenkins-jobs --conf $JJBINI update --delete-old --workers 4 jjb/
 
 #     publishers:
-#       - ecomp-infra-shiplogs
+#       - infra-shiplogs
 
 - job-template:
     name: '{project}-verify-packer'
@@ -134,11 +134,11 @@
     concurrent: true
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: 14
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: 'master'
           refspec: 'refs/heads/master'
@@ -150,7 +150,7 @@
           choosing-strategy: 'gerrit'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -164,7 +164,7 @@
       - packer-validate
 
 #     publishers:
-#       - ecomp-infra-shiplogs
+#       - infra-shiplogs
 
 - job-template:
     name: '{project}-merge-packer-{platforms}-{templates}'
@@ -173,11 +173,11 @@
     concurrent: true
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: 14
 
     parameters:
-      - ecomp-infra-parameters:
+      - infra-parameters:
           project: '{project}'
           branch: 'master'
           refspec: 'refs/heads/master'
@@ -189,7 +189,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -206,4 +206,4 @@
           template: '{templates}'
 
 #     publishers:
-#       - ecomp-infra-shiplogs
+#       - infra-shiplogs

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 78f9e2e..42c35ae 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -68,7 +68,7 @@
 
 # PARAMETERS
 - parameter:
-    name: ecomp-infra-parameters
+    name: infra-parameters
     parameters:
       - string:
           name: PROJECT
@@ -111,7 +111,7 @@
 
 # PROPERTIES
 - property:
-    name: ecomp-infra-properties
+    name: infra-properties
     properties:
       - build-discarder:
           days-to-keep: '{build-days-to-keep}'
@@ -169,7 +169,7 @@
                 unhealthy: 40
 
 - publisher:
-    name: ecomp-infra-shiplogs
+    name: infra-shiplogs
     # To archive things, the job will need to create an "archives" directory in
     # the workspace and this macro will handle copying the contents of the
     # archives directory.
@@ -358,7 +358,7 @@
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by the eCOMP infra.
-    name: ecomp-infra-wrappers
+    name: infra-wrappers
     wrappers:
       - timeout:
           type: absolute

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 1300dbc..ffab7c3 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -15,11 +15,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}'
@@ -33,7 +33,7 @@
           choosing-strategy: 'gerrit'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -58,7 +58,7 @@
             - maven.test.skip=true
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
+#       - infra-shiplogs:
 #           maven-version: '{maven-version}'
 
 
@@ -78,11 +78,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}'
@@ -96,7 +96,7 @@
           choosing-strategy: 'gerrit'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -119,7 +119,7 @@
           global-settings-type: cfp
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
+#       - infra-shiplogs:
 #           maven-version: '{maven-version}'
 
 - job-template:
@@ -141,11 +141,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}'
@@ -159,7 +159,7 @@
           choosing-strategy: 'gerrit'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -183,7 +183,7 @@
           global-settings-type: cfp
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
+#       - infra-shiplogs:
 #           maven-version: '{maven-version}'
 
 - job-template:
@@ -200,11 +200,11 @@
     node: '{build-node}'
     maven-deploy-properties:
     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}'
@@ -218,7 +218,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -258,11 +258,11 @@
     node: '{build-node}'
     maven-deploy-properties:
     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}'
@@ -276,7 +276,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -331,11 +331,11 @@
     node: '{build-node}'
     maven-deploy-properties:
     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}'
@@ -349,7 +349,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -390,11 +390,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}'
@@ -408,7 +408,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -433,7 +433,7 @@
           global-settings-type: cfp
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
+#       - infra-shiplogs:
 #           maven-version: '{maven-version}'
 
 - job-template:
@@ -451,11 +451,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}'
@@ -469,7 +469,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -497,7 +497,7 @@
           global-settings-type: cfp
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
+#       - infra-shiplogs:
 #           maven-version: '{maven-version}'
 
 - job-template:
@@ -518,11 +518,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}'
@@ -536,7 +536,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -562,7 +562,7 @@
           global-settings-type: cfp
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
+#       - infra-shiplogs:
 #           maven-version: '{maven-version}'
 
 - job-template:
@@ -571,11 +571,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}'
@@ -589,7 +589,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -621,11 +621,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}'
@@ -639,7 +639,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -674,11 +674,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}'
@@ -692,7 +692,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -740,11 +740,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}'
@@ -758,7 +758,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -803,11 +803,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}'
@@ -821,7 +821,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -884,11 +884,11 @@
     node: '{build-node}'
     maven-deploy-properties:
     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}'
@@ -902,7 +902,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -959,11 +959,11 @@
     node: '{build-node}'
     maven-deploy-properties:
     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}'
@@ -977,7 +977,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -1029,11 +1029,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}'
@@ -1047,7 +1047,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:

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:

diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 87ddb87..416717b 100644 (file)
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -20,11 +20,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}'
@@ -38,7 +38,7 @@
           choosing-strategy: 'gerrit'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -79,11 +79,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}'
@@ -97,7 +97,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -141,11 +141,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}'
@@ -159,7 +159,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -215,11 +215,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}'
@@ -233,7 +233,7 @@
           choosing-strategy: 'default'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -293,11 +293,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}'
@@ -316,7 +316,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -366,11 +366,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}'
@@ -389,7 +389,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -440,11 +440,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}'
@@ -463,7 +463,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -515,11 +515,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}'
@@ -533,7 +533,7 @@
           choosing-strategy: 'gerrit'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -558,7 +558,7 @@
       - shell: '{script}'
 
 #    publishers:
-#      - ecomp-infra-shiplogs:
+#      - infra-shiplogs:
 #          maven-version: '{maven-version}'
 
 - job-template:
@@ -583,11 +583,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}'
@@ -606,7 +606,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -631,7 +631,7 @@
       - shell: '{script}'
 
 #    publishers:
-#      - ecomp-infra-shiplogs:
+#      - infra-shiplogs:
 #          maven-version: '{maven-version}'
 
 
@@ -663,11 +663,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}'
@@ -690,7 +690,7 @@
           checkout-dir: '{checkout-dir2}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -715,7 +715,7 @@
       - shell: '{script}'
 
 #    publishers:
-#      - ecomp-infra-shiplogs:
+#      - infra-shiplogs:
 #          maven-version: '{maven-version}'
 
 # vim: sw=2 ts=2 sts=2 et :
@@ -735,11 +735,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}'
@@ -763,7 +763,7 @@
           checkout-dir: '{checkout-dir2}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -789,7 +789,7 @@
       - shell: '{script}'
 
 #    publishers:
-#      - ecomp-infra-shiplogs:
+#      - infra-shiplogs:
 #          maven-version: '{maven-version}'
 
 - job-template:
@@ -807,11 +807,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}'
@@ -835,7 +835,7 @@
           checkout-dir: '{checkout-dir2}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -860,7 +860,7 @@
       - shell: '{script}'
 
 #    publishers:
-#      - ecomp-infra-shiplogs:
+#      - infra-shiplogs:
 #          maven-version: '{maven-version}'
 
 - job-template:
@@ -888,11 +888,11 @@
           default: '{project}'
 
     properties:
-      - ecomp-infra-properties:
+      - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     builders: