X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-script.yaml;h=c2da1cd9e930f0addbe2b8f0bd58d28e24faac8e;hb=b7839a2075a05c1a0a891bdf4f38635071c6af01;hp=00b143d4e7b4e5af34b8a0775435037d6cb9e41c;hpb=b23ba04d4fad6eae787a4a22798b7e69806f8045;p=ci-management.git

diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 00b143d4e..c2da1cd9e 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -20,25 +20,26 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -53,7 +54,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -62,6 +63,9 @@
       - docker-login
       - shell: '{script}'
 
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for merging a submission.  triggered on
@@ -79,25 +83,26 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -112,7 +117,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -121,6 +126,9 @@
       - docker-login
       - shell: '{script}'
 
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for daily-release a submission.  triggered on timer, does
@@ -141,30 +149,35 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
       # 11 AM UTC
       - timed: 'H 11 * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
 
     builders:
       - provide-maven-settings:
@@ -173,7 +186,7 @@
       - inject:
           properties-file: version.properties
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals-versioning}'
           properties:
             - 'newVersion=${{release_version}}'
@@ -183,7 +196,80 @@
           global-settings-type: cfp
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
+          goals: '{mvn-goals}'
+          properties:
+            - '{maven-deploy-properties}'
+          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}'
+
+- job-template:
+    # Job template for daily-release a submission.  triggered on timer, does
+    # scm mvn with passed-in goals, then run script.
+    # Version changed using include-update-pom-versions.sh script
+    #
+    # Required Variables:
+    #   branch:         git branch
+    #   script:         build script to execute
+    #   mvn-goals: space separated list of maven build goals (--version for
+    #      noop, or clean deploy)
+    name: '{project-name}-{stream}-daily-release-version2-scm-mvn-script'
+
+    project-type: freestyle
+    concurrent: true
+    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:
+      # 11 AM UTC
+      - timed: 'H 11 * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+
+      - inject:
+          properties-file: version.properties
+
+      - shell: !include-raw-escape: include-update-pom-versions.sh
+
+      - maven-target:
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           properties:
             - '{maven-deploy-properties}'
@@ -194,6 +280,9 @@
       - docker-login
       - shell: '{script}'
 
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for verifying a submission.  triggered on
@@ -220,22 +309,23 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -243,7 +333,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -258,7 +348,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -267,6 +357,9 @@
       - docker-login
       - shell: '{script}'
 
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for merged submission.  triggered on
@@ -293,22 +386,23 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -316,7 +410,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -331,7 +425,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -340,6 +434,9 @@
       - docker-login
       - shell: '{script}'
 
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for merged submission.  triggered on
@@ -367,22 +464,23 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -390,11 +488,15 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
       - timed: 'H 11 * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
 
     builders:
       - provide-maven-settings:
@@ -403,7 +505,7 @@
       - inject:
           properties-file: version.properties
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals-versioning}'
           properties:
             - 'newVersion=${{release_version}}'
@@ -413,7 +515,7 @@
           global-settings-type: cfp
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -422,6 +524,9 @@
       - docker-login
       - shell: '{script}'
 
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for basic scm and script trigger
@@ -438,25 +543,26 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -472,7 +578,7 @@
           settings-file: '{mvn-settings}'
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '--version'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -480,9 +586,9 @@
           global-settings-type: cfp
       - shell: '{script}'
 
-#    publishers:
-#      - ecomp-infra-shiplogs:
-#          maven-version: 'mvn33'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for 2 scm and script trigger
@@ -506,22 +612,23 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -529,7 +636,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -545,7 +652,7 @@
           settings-file: '{mvn-settings}'
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '--version'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -553,9 +660,9 @@
           global-settings-type: cfp
       - shell: '{script}'
 
-#    publishers:
-#      - ecomp-infra-shiplogs:
-#          maven-version: 'mvn33'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 
 - job-template:
@@ -586,21 +693,22 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project1}'
           refspec: '{extra-refspec1}'
@@ -613,7 +721,7 @@
           checkout-dir: '{checkout-dir2}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -629,7 +737,7 @@
           settings-file: '{mvn-settings}'
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '--version'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -637,9 +745,9 @@
           global-settings-type: cfp
       - shell: '{script}'
 
-#    publishers:
-#      - ecomp-infra-shiplogs:
-#          maven-version: 'mvn33'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 # vim: sw=2 ts=2 sts=2 et :
 
@@ -658,22 +766,23 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project1}'
           refspec: '{extra-refspec1}'
@@ -686,7 +795,7 @@
           checkout-dir: '{checkout-dir2}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -703,7 +812,7 @@
       - docker-login
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '--version'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -711,9 +820,9 @@
           global-settings-type: cfp
       - shell: '{script}'
 
-#    publishers:
-#      - ecomp-infra-shiplogs:
-#          maven-version: 'mvn33'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for scm and script trigger - for docker daily release
@@ -730,22 +839,23 @@
     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}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project1}'
           refspec: '{extra-refspec1}'
@@ -758,7 +868,7 @@
           checkout-dir: '{checkout-dir2}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -774,7 +884,7 @@
       - docker-login
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '--version'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -782,6 +892,53 @@
           global-settings-type: cfp
       - shell: '{script}'
 
-#    publishers:
-#      - ecomp-infra-shiplogs:
-#          maven-version: 'mvn33'
\ No newline at end of file
+    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:
+      - 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}'