X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=710ee05f64d5f06e16b4a788da9e9654900af343;hb=b38ad5801939766c6b0656487e3eaa113a7d4054;hp=7cdc433707b82611fb20d98a59cf7e7358c7e74b;hpb=9515aeec2c18692963a164c327fafa091f1cfa17;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 7cdc43370..710ee05f6 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -3,14 +3,24 @@
 - job-template:
     name: 'autorelease-release-{stream}'
 
-    project-type: freestyle
-    node: centos7-autorelease-4c-16g
-    jdk: '{jdk}'
-    cron: 'H 0 * * *'
+    ############
+    # Defaults #
+    ############
 
-    # Default variable values
+    build-node: centos7-autorelease-8c-16g
+    java-version: openjdk8
+    mvn-version: mvn33
     extra-mvn-opts: ''
 
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: '{build-node}'
+    jdk: '{java-version}'
+    cron: 'H 0 * * *'
+
     properties:
       - lf-infra-properties:
           build-days-to-keep: 30
@@ -22,6 +32,7 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
+          lftools-version: '{lftools-version}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
@@ -49,7 +60,7 @@
           refspec: '$GERRIT_REFSPEC'
           branches:
             - '$GERRIT_BRANCH'
-          choosing-strategy: 'gerrit'
+          choosing-strategy: default
           skip-tag: true
           submodule:
             recursive: true
@@ -64,13 +75,8 @@
 
     builders:
       # force jenkins install of maven version before any shell scripts use it
-      - maven-target:
-          maven-version: 'mvn33'
-          goals: '-version'
-          settings: 'autorelease-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
       - wipe-local-maven-repo
       - jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
@@ -78,11 +84,11 @@
       - autorelease-cfp:
           autorelease-settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'
-      - autorelease-generate-taglist
+      - autorelease-generate-release-patches
+      - autorelease-generate-artifact-versions
       - autorelease-distribute-taglist
       - distribute-build-url:
           path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
-      - autorelease-generate-release-patches
       # In a perfect world projects should be releasing separately and we consume them
       # via a project that pulls the release bits from each project from Nexus.
       # Keep the patches compatible with that ideal, but apply an edit
@@ -99,7 +105,7 @@
               -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
               {opendaylight-infra-mvn-opts}
           java-opts:
-            - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -148,7 +154,7 @@
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-builder-2c-8g
 
     properties:
       - lf-infra-properties:
@@ -159,6 +165,7 @@
           project: releng/builder
           branch: '{branch}'
           stream: '{stream}'
+          lftools-version: '{lftools-version}'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -192,8 +199,7 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
-      - shell: !include-raw-escape:
-          - update-validate-autorelease-projects.sh
+      - autorelease-update-validate-projects
       - opendaylight-infra-push-gerrit-patch:
           project: 'releng/builder'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
@@ -206,7 +212,7 @@
 - job-template:
     name: autorelease-version-bump-{stream}
     project-type: freestyle
-    node: centos7-autorelease-4c-16g
+    node: centos7-builder-4c-16g
 
     properties:
       - opendaylight-infra-properties:
@@ -218,6 +224,7 @@
           branch: '{branch}'
           stream: '{stream}'
           refspec: 'refs/heads/{branch}'
+          lftools-version: '{lftools-version}'
       - string:
           name: RELEASE_TAG
           default: '{next-release-tag}'
@@ -243,7 +250,7 @@
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: 240
+          build-timeout: 480
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
@@ -261,17 +268,25 @@
           - version-bump.sh
 
     publishers:
-      - trigger-parameterized-builds:
-          - project: 'autorelease-generate-release-notes-{stream}'
-            condition: UNSTABLE_OR_BETTER
-            trigger-with-no-params: true
       - lf-infra-publish
 
 - job-template:
     name: 'autorelease-generate-release-notes-{stream}'
 
+    ######################
+    # Default parameters #
+    ######################
+
+    gerrit_merge_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: generate-release-notes .+$
+
+    #####################
+    # Job Configuration #
+    #####################
+
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-builder-2c-8g
 
     properties:
       - lf-infra-properties:
@@ -282,12 +297,16 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
+          lftools-version: '{lftools-version}'
+      - string:
+          name: RELEASE
+          description: Release to generate release notes for.
 
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
+          branch: '$GERRIT_BRANCH'
+          refspec: '$GERRIT_REFSPEC'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
           choosing-strategy: default
@@ -298,22 +317,127 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     triggers:
-      - timed: '0 0 * * 0'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on: '{obj:gerrit_merge_triggers}'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
 
     builders:
-      - lf-maven-install:
-          mvn-version: mvn33
+      - autorelease-generate-release-notes
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-validate-autorelease-{stream}'
+
+    ############
+    # Defaults #
+    ############
+
+    java-version: openjdk8
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    disabled: false
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: true
+    jdk: '{java-version}'
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+          lftools-version: '{lftools-version}'
+      - autorelease-release-tag:
+          release-tag: validate
+      - string:
+          name: CLONE_URL
+          default: '{git-url}/releng/autorelease'
+          description: "Autorelease clone URL"
+
+    scm:
+      - git:
+          url: '$CLONE_URL'
+          credentials-id: 'opendaylight-jenkins-ssh'
+          refspec: ''
+          branches:
+            - 'origin/{branch}'
+          skip-tag: true
+          submodule:
+            recursive: true
+            timeout: 60
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          gerrit-server-name: '{gerrit-server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**/*.xml'
+
+    builders:
+      - autorelease-checkout-gerrit-patch
+      - jacoco-nojava-workaround
+      - shell: "./scripts/list-project-dependencies.sh"
+      - autorelease-determine-merge-order
+      - autorelease-generate-release-patches
+      # In a perfect world projects should be releasing separately and we consume them
+      # via a project that pulls the release bits from each project from Nexus.
+      # 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: mvn33
-          pom: '$WORKSPACE/scripts/release_notes_management/pom.xml'
+          pom: validate-pom.xml
           goals: |
-              clean package
+              clean install dependency:tree
+              -T1.5C
+              -Pq
               {opendaylight-infra-mvn-opts}
+          java-opts:
+            - '-Xmx8g'
           settings: autorelease-settings
           settings-type: cfp
           global-settings: global-settings
           global-settings-type: cfp
-      - autorelease-generate-release-notes
+      # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease
+      - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom
+      - maven-target:
+          maven-version: mvn33
+          pom: pom.xml
+          goals: |
+              clean validate
+              -Pq
+              {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
+      - shell: |
+          mkdir -p archives/
+          cp *.log $_
 
     publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[autorelease] [{project-name}]'
       - lf-infra-publish