Merge "Remove distribution-check job for archetypes"

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 651004d73e42321a0cfe04b39de8cc396910e936..e0733cb4fb04e2fd83e0659605818896cf54d48e 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -54,11 +54,12 @@
 - job-template:
     name: 'autorelease-release-{stream}'
 
-    ############
-    # Defaults #
-    ############
+    ######################
+    # Default parameters #
+    ######################
 
     build-node: '{build-node}'
+    cron: 'H 0 * * *'
     java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
@@ -70,7 +71,6 @@
     project-type: freestyle
     node: '{build-node}'
     jdk: '{java-version}'
-    cron: 'H 0 * * *'
 
     properties:
       - lf-infra-properties:
@@ -153,7 +153,6 @@
               $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:
@@ -173,11 +172,6 @@
       - 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,10 +200,30 @@
             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:
     name: autorelease-update-validate-jobs-{stream}
+
+    ######################
+    # Default parameters #
+    ######################
+
+    cron: '@weekly'
+
+    #####################
+    # Job configuration #
+    #####################
+
     project-type: freestyle
     node: centos7-builder-2c-1g
 
@@ -234,6 +248,7 @@
           choosing-strategy: default
 
     triggers:
+      - timed: '{cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on:
@@ -487,14 +502,13 @@
           global-settings: global-settings
           global-settings-type: cfp
       # 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
+      - 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
           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'
@@ -505,11 +519,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: