Merge "Fix Nokia image generation"

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

diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 9058133..991ffd6 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}'
@@ -36,9 +36,10 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -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,11 +83,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}'
@@ -95,9 +99,10 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -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,11 +149,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}'
@@ -157,9 +165,10 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -198,6 +207,82 @@
       - 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}'
+          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 verifying a submission.  triggered on
@@ -224,11 +309,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}'
@@ -240,6 +325,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -247,7 +333,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -271,6 +357,9 @@
       - docker-login
       - shell: '{script}'
 
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for merged submission.  triggered on
@@ -297,11 +386,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}'
@@ -313,6 +402,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -320,7 +410,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -344,6 +434,9 @@
       - docker-login
       - shell: '{script}'
 
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for merged submission.  triggered on
@@ -371,11 +464,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}'
@@ -387,6 +480,7 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -394,7 +488,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -430,6 +524,9 @@
       - docker-login
       - shell: '{script}'
 
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for basic scm and script trigger
@@ -446,11 +543,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}'
@@ -462,9 +559,10 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -488,9 +586,9 @@
           global-settings-type: cfp
       - shell: '{script}'
 
-#    publishers:
-#      - ecomp-infra-shiplogs:
-#          maven-version: '{maven-version}'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for 2 scm and script trigger
@@ -514,11 +612,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}'
@@ -530,6 +628,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project}'
           refspec: '{extra-refspec}'
@@ -537,7 +636,7 @@
           checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -561,9 +660,9 @@
           global-settings-type: cfp
       - shell: '{script}'
 
-#    publishers:
-#      - ecomp-infra-shiplogs:
-#          maven-version: '{maven-version}'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 
 - job-template:
@@ -594,11 +693,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}'
@@ -609,6 +708,7 @@
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
           project: '{extra-project1}'
           refspec: '{extra-refspec1}'
@@ -621,7 +721,7 @@
           checkout-dir: '{checkout-dir2}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -645,32 +745,32 @@
           global-settings-type: cfp
       - shell: '{script}'
 
-#    publishers:
-#      - ecomp-infra-shiplogs:
-#          maven-version: '{maven-version}'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 # vim: sw=2 ts=2 sts=2 et :
 
 - job-template:
-    # Job template for scm and script trigger - for docker merge
+    # Job template for two scm and script trigger - for docker merge
     #
     # Required Variables:
     #   branch:         git branch
     #   build-node:     what build node to run on
     #   script:         build script to execute
 
-    name: '{project-name}-{stream}-merge-docker-script'
+    name: '{project-name}-{stream}-two-scm-merge-docker-script'
 
     project-type: freestyle
     concurrent: true
     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}'
@@ -682,19 +782,15 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
-          project: '{extra-project1}'
-          refspec: '{extra-refspec1}'
-          branch: '{extra-branch1}'
-          checkout-dir: '{checkout-dir1}'
-      - git-extra-project:
-          project: '{extra-project2}'
-          refspec: '{extra-refspec2}'
-          branch: '{extra-branch2}'
-          checkout-dir: '{checkout-dir2}'
+          project: '{extra-project}'
+          refspec: '{extra-refspec}'
+          branch: '{extra-branch}'
+          checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -719,30 +815,30 @@
           global-settings-type: cfp
       - shell: '{script}'
 
-#    publishers:
-#      - ecomp-infra-shiplogs:
-#          maven-version: '{maven-version}'
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
-    # Job template for scm and script trigger - for docker daily release
+    # Job template for two scm and script trigger - for docker daily release
     #
     # Required Variables:
     #   branch:         git branch
     #   build-node:     what build node to run on
     #   script:         build script to execute
 
-    name: '{project-name}-{stream}-release-docker-script-manual'
+    name: '{project-name}-{stream}-two-scm-release-docker-script-manual'
 
     project-type: freestyle
     concurrent: true
     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}'
@@ -754,19 +850,15 @@
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
       - git-extra-project:
-          project: '{extra-project1}'
-          refspec: '{extra-refspec1}'
-          branch: '{extra-branch1}'
-          checkout-dir: '{checkout-dir1}'
-      - git-extra-project:
-          project: '{extra-project2}'
-          refspec: '{extra-refspec2}'
-          branch: '{extra-branch2}'
-          checkout-dir: '{checkout-dir2}'
+          project: '{extra-project}'
+          refspec: '{extra-refspec}'
+          branch: '{extra-branch}'
+          checkout-dir: '{checkout-dir}'
 
     wrappers:
-      - ecomp-infra-wrappers:
+      - infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
@@ -790,6 +882,53 @@
           global-settings-type: cfp
       - shell: '{script}'
 
-#    publishers:
-#      - ecomp-infra-shiplogs:
-#          maven-version: '{maven-version}'
+    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}'