X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=bd5d84cf37493563ee2a55c0e26a74bf619d1726;hb=465f22e1934bd1c93c322fc8a609a46e97d32ac3;hp=b23a9124baebe5a5b83982139bc5891d680604b3;hpb=515c49231432baf80755d2a5eabbec881bb94a69;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index b23a9124b..bd5d84cf3 100644
--- 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,14 +146,13 @@
       # 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
               $EXTRA_MVN_OPTS
               -Pintegrationtests,docs,repoBuild
               -Dcheckstyle.skip=true
-              -Dkaraf.keep.unpack=true
               -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
               {opendaylight-infra-mvn-opts}
           java-opts:
@@ -166,18 +165,13 @@
       - 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
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
-          for file in $(find . -name karaf.log); do
-              module="${{file%%/target/*}}"
-              module="${{module##*/}}"
-              cp "$file" "archives/${{module}}-karaf.log"
-          done
 
     publishers:
       - opendaylight-infra-notify-status
@@ -206,6 +200,15 @@
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
             property-file: variables.jenkins-trigger
             fail-on-missing: true
+      # Critical component of the OpenDaylight community
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - SUCCESS
+              build-steps:
+                - shell: echo '#topic cookies'
+          mark-unstable-if-failed: false
       - lf-infra-publish
 
 - job-template:
@@ -268,6 +271,7 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
+      - autorelease-update-project-views
       - autorelease-update-validate-projects
       - opendaylight-infra-push-gerrit-patch:
           project: 'releng/builder'
@@ -296,7 +300,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...
@@ -315,7 +319,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:
@@ -334,7 +338,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
@@ -485,7 +489,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
@@ -501,12 +505,11 @@
       # 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
               -Pq
-              -Dkaraf.keep.unpack=true
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -517,11 +520,6 @@
       - shell: |
           mkdir -p archives/
           cp *.log $_
-          for file in $(find . -name karaf.log); do
-              module="${{file%%/target/*}}"
-              module="${{module##*/}}"
-              cp "$file" "archives/${{module}}-karaf.log"
-          done
 
     publishers:
       - email-notification: