X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-script.yaml;h=3dbe82d74dfe8977ec4f86cb60464d6c2e871f5e;hb=aea673bb5fc4f92297ef3798abdd203157359d08;hp=e6f0744075936cae9a31ae80f5fe2fe0dad4b4da;hpb=a9c4c768b8f6c282a39e9ffb49edebe63bed3e53;p=ci-management.git

diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index e6f074407..3dbe82d74 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -18,6 +18,9 @@
     name: '{project-name}-{stream}-{area}-verify-shell'
     node: '{build-node}'
     type: freestyle
+    concurrent: true
+    disable-job: false
+    disabled: '{disable-job}'
 
     pattern: '**'
 
@@ -41,76 +44,15 @@
           branch: '{branch}'
           files: '{pattern}'
 
-    builders:
-      - shell: '{script}'
-
-    publishers:
-      - lf-infra-publish
-
-- job-template:
-    # Job template for merging a submission.  triggered on
-    # gerrit-trigger-patch-merged, does scm, mvn with passed-in goals, then
-    # run script
-    # Required Variables:
-    #   branch:         git branch
-    #   script:         build script to execute
-    #   mvn-settings:   settings file for this specific job
-    #   mvn-goals:      space separated list of maven build goals (--version
-    #                   for noop, clean deploy for deploy [snapshot])
-    name: '{project-name}-{stream}-merge-scm-mvn-script'
-
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
     wrappers:
       - infra-wrappers:
           build-timeout: '{build-timeout}'
 
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
     builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - docker-login
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
+      - lf-infra-publish
 
 - job-template:
     # Job template for 2 scm and script trigger
@@ -184,10 +126,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-
+      - lf-infra-publish
 
 # vim: sw=2 ts=2 sts=2 et :
 
@@ -257,8 +196,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for two scm and script trigger - for docker daily release
@@ -325,53 +263,4 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # 1. PULL the desired image
-    # 2. TAG it to the desired release name
-    # 3. PUSH the newly tagged image on release repo
-
-    name: '{project-name}-docker-image-blessing'
-
-    project-type: freestyle
-    concurrent: true
-    node: 'ubuntu1604-docker-8c-8g'
-
-    parameters:
-      - string:
-          name: X
-          description: "x VERSION of the STAGING image to bless into this RELEASE VERSION
-            Example : 1"
-      - string:
-          name: Y
-          description: "y VERSION of the STAGING image to bless into this RELEASE VERSION
-            Example : 2"
-      - string:
-          name: Z
-          description: "z VERSION of the RELEASE VERSION
-            Example : 3"
-      - string:
-          name: PROJECT
-          default: '{project}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - docker-login
-      - shell: !include-raw: include-docker-blessing.sh
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish