X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=cb434a3b0760128cfafb9a0396a2995f271f6227;hb=fbb6852790ef13e01d614200cf9c9ac821105ef5;hp=dc03923f230cbc714184664edffa9458826b24da;hpb=d46cee9d46843a33c60fbdb5f26779f8befeb146;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index dc03923f2..cb434a3b0 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -37,7 +37,9 @@
           branch: master
           refspec: 'refs/heads/master'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
@@ -52,7 +54,7 @@
       - lf-infra-publish
 
 - job-template:
-    name: 'autorelease-release-{stream}'
+    name: 'autorelease-release-{stream}-{mvn-version}-{java-version}'
 
     ######################
     # Default parameters #
@@ -60,9 +62,15 @@
 
     build-node: '{build-node}'
     cron: 'H 0 * * *'
-    java-version: openjdk8
+    java-version: '{java-version}'
+    mvn-global-settings: global-settings
+    mvn-goals: clean deploy
+    mvn-opts: '-Xmx8g -Dmaven.compile.fork=true'
+    mvn-params: ''
+    mvn-settings: autorelease-settings
     mvn-version: mvn35
-    extra-mvn-opts: ''
+    sign-artifacts: true
+    disable-job: 'false'
 
     #####################
     # Job Configuration #
@@ -70,39 +78,34 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
           build-days-to-keep: 30
 
     parameters:
-      - maven-exec:
-          maven-version: 'mvn35'
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
           lftools-version: '{lftools-version}'
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
           release-tag: '{stream}'
-      - string:
-          name: EXTRA_MVN_OPTS
-          default: '{extra-mvn-opts}'
-          description: |
-              Additional optional Maven Options to pass to the Maven Goals
-              parameter.
-
-              Examples:
-              -Dskip.karaf.featureTest=true  # To disable karaf SingleFeatureTests
-              --fail-never   # NEVER fail the build, regardless of project result
-              --fail-at-end  # Only fail the build afterwards; allow all non-impacted builds to continue
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - string:
+          name: STAGING_PROFILE_ID
+          default: '{staging-profile-id}'
+          description: Nexus staging profile ID.
 
     scm:
       - git:
@@ -125,18 +128,21 @@
       - timed: '{cron}'
 
     builders:
+      - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - wipe-local-maven-repo
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
-      - autorelease-cfp:
-          autorelease-settings: 'autorelease-settings'
-          global-settings: 'odl-global-settings'
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
       - autorelease-generate-release-patches
       - autorelease-generate-artifact-versions
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - autorelease-distribute-taglist
       - distribute-build-url:
           path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
@@ -145,30 +151,22 @@
       # Keep the patches compatible with that ideal, but apply an edit
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
-      - maven-target:
-          maven-version: 'mvn35'
-          pom: 'pom.xml'
-          goals: |
-              clean deploy
-              $EXTRA_MVN_OPTS
-              -Pintegrationtests,repoBuild
-              -Dcheckstyle.skip=true
-              -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: 'autorelease-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - autorelease-maven-deploy
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
+      - lf-sigul-sign-dir:
+          sign-artifacts: '{sign-artifacts}'
+          sign-dir: '$WORKSPACE/m2repo'
+          sign-mode: serial
+      - lf-maven-stage:
+          mvn-global-settings: '{mvn-global-settings}'
+          mvn-settings: '{mvn-settings}'
+          mvn-staging-id: '{mvn-staging-id}'
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
-          maven-version: 'mvn35'
-          settings: 'autorelease-settings'
-          global-settings: 'global-settings'
-      - autorelease-maven-sources-post-process
+          maven-version: '{mvn-version}'
+          settings: '{mvn-settings}'
+          global-settings: '{mvn-global-settings}'
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
@@ -212,6 +210,7 @@
     ######################
 
     cron: 'H 0 * * *'
+    disable-job: 'false'
 
     #####################
     # Job configuration #
@@ -219,6 +218,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-2g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -238,7 +238,9 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
@@ -250,6 +252,7 @@
       - timed: '{obj:cron}'
 
     builders:
+      - lf-infra-pre-build
       # Fetch latest head of branch
       - shell: |
           git checkout $GERRIT_BRANCH
@@ -274,6 +277,7 @@
     ######################
 
     cron: '@weekly'
+    disable-job: 'false'
 
     #####################
     # Job configuration #
@@ -281,6 +285,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-1g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -299,7 +304,9 @@
           branch: master
           refspec: 'refs/heads/master'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     triggers:
@@ -326,6 +333,7 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
+      - lf-infra-pre-build
       - autorelease-update-project-views
       - autorelease-update-validate-projects
       - lf-infra-push-gerrit-patch:
@@ -342,8 +350,23 @@
 
 - job-template:
     name: autorelease-version-bump-{stream}
+
+    #####################
+    # Default variables #
+    #####################
+
+    mvn-global-settings: global-settings
+    mvn-settings: autorelease-settings
+    mvn-version: mvn35
+    disable-job: 'false'
+
+    #####################
+    # Job configuration #
+    #####################
+
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -377,7 +400,7 @@
               and artifacts are not pushed to Nexus. Instead the build will be
               performed using the goals "clean install".
       - maven-exec:
-          maven-version: mvn35
+          maven-version: '{mvn-version}'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -385,7 +408,9 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
@@ -394,17 +419,14 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
+      - lf-infra-pre-build
       # force jenkins install of maven version before any shell scripts use it
-      - maven-target:
-          maven-version: mvn35
-          goals: '-version'
-          settings: autorelease-settings
-          settings-type: cfp
-          global-settings: global-settings
-          global-settings-type: cfp
-      - autorelease-cfp
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
       - shell: !include-raw-escape:
-          - ../global-jjb/shell/lftools-install.sh
           - version-bump.sh
 
     publishers:
@@ -416,6 +438,7 @@
     ######################
     # Default parameters #
     ######################
+    disable-job: 'false'
 
     gerrit_merge_triggers:
       - comment-added-contains-event:
@@ -427,6 +450,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-8g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -440,15 +464,18 @@
           lftools-version: '{lftools-version}'
       - string:
           name: RELEASE
-          description: Release to generate release notes for.
-
+          description: |
+              Release to generate release notes for.
+              Eg. Neon-SR1, Fluorine-SR2...
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           branch: '$GERRIT_BRANCH'
           refspec: '$GERRIT_REFSPEC'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
@@ -468,6 +495,7 @@
                   branch-pattern: '**/{branch}'
 
     builders:
+      - lf-infra-pre-build
       - autorelease-generate-release-notes
 
     publishers:
@@ -476,23 +504,27 @@
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
 
-    ############
-    # Defaults #
-    ############
+    #####################
+    # Default variables #
+    #####################
 
     java-version: openjdk8
+    mvn-global-settings: global-settings
+    mvn-settings: autorelease-settings
+    mvn-version: mvn35
+    disable-job: 'false'
 
     #####################
     # Job Configuration #
     #####################
 
-    disabled: false
     project-type: freestyle
     # Note: This NEEDS to be hardcoded as projects should NOT be allowed to
     #       override the build node.
     node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -539,7 +571,7 @@
       - lf-infra-pre-build
       - autorelease-checkout-gerrit-patch
       - autorelease-compare-projects
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
       - autorelease-generate-release-patches
@@ -549,7 +581,7 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: mvn35
+          maven-version: '{mvn-version}'
           pom: validate-pom.xml
           goals: |
               clean install dependency:tree
@@ -558,22 +590,22 @@
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g'
-          settings: autorelease-settings
+          settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: global-settings
+          global-settings: '{mvn-global-settings}'
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn35
+          maven-version: '{mvn-version}'
           pom: pom.xml
           goals: |
               clean validate
               -Pq
               {opendaylight-infra-mvn-opts}
           java-opts:
-            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: autorelease-settings
+            - '-Xmx8g -Dmaven.compile.fork=true'
+          settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: global-settings
+          global-settings: '{mvn-global-settings}'
           global-settings-type: cfp
       - shell: |
           mkdir -p archives/