Merge "Remove docs profile from autorelease build"

[releng/builder.git] / jjb / autorelease / autorelease-templates.yaml

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 4571d4f83ce0241b89087524581133f339eb511c..37e7fdead62e33b4e0ba77204d0c68edb1dc38a7 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -61,7 +61,7 @@
     build-node: '{build-node}'
     cron: 'H 0 * * *'
     java-version: openjdk8
-    mvn-version: mvn33
+    mvn-version: mvn35
     extra-mvn-opts: ''
 
     #####################
@@ -78,7 +78,7 @@
 
     parameters:
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
@@ -87,7 +87,7 @@
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
-          release-tag: '{next-release-tag}'
+          release-tag: '{stream}'
       - string:
           name: EXTRA_MVN_OPTS
           default: '{extra-mvn-opts}'
@@ -146,7 +146,7 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: 'pom.xml'
           goals: |
               clean deploy
@@ -165,7 +165,7 @@
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           settings: 'autorelease-settings'
           global-settings: 'global-settings'
       - autorelease-maven-sources-post-process
@@ -183,13 +183,6 @@
           - project: 'integration-distribution-test-{integration-test}'
             condition: FAILED
             trigger-with-no-params: true
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: UNSTABLE_OR_BETTER
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: FAILED
-            trigger-with-no-params: true
           - project: 'packaging-build-rpm-{stream}'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
@@ -271,12 +264,16 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
+      - autorelease-update-project-views
       - autorelease-update-validate-projects
-      - opendaylight-infra-push-gerrit-patch:
-          project: 'releng/builder'
+      - lf-infra-push-gerrit-patch:
+          project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
           gerrit-commit-message: |
-              Update validate autorelease projects for {stream}
+              'Update validate autorelease projects for {stream}'
+          reviewers-email: 'release@lists.opendaylight.org'
 
     publishers:
       - lf-infra-publish
@@ -299,7 +296,7 @@
           lftools-version: '{lftools-version}'
       - string:
           name: RELEASE_TAG
-          default: '{next-release-tag}'
+          default: '{stream}'
           description: |
               Release that is being version bumped.
               Eg. Lithium, Beryllium, Boron, Carbon, Carbon-SR1, Carbon-SR2...
@@ -318,7 +315,7 @@
               and artifacts are not pushed to Nexus. Instead the build will be
               performed using the goals "clean install".
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - lf-infra-gerrit-scm:
@@ -337,7 +334,7 @@
     builders:
       # force jenkins install of maven version before any shell scripts use it
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           goals: '-version'
           settings: autorelease-settings
           settings-type: cfp
@@ -488,7 +485,7 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: validate-pom.xml
           goals: |
               clean install dependency:tree
@@ -504,7 +501,7 @@
       # 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 || true
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: pom.xml
           goals: |
               clean validate