Merge "Update CentOS7 docker images"

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 293b6c60f4d3fb3e4653318b325095a0ecc9ad40..208a0643c814b26a170b7768d3e062e5ad4dc77e 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,6 +3,7 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
+      - autorelease-generate-release-notes-{stream}
       - autorelease-version-bump-{stream}
 
     stream:
@@ -20,6 +21,8 @@
           karaf-version: karaf3
           extra-mvn-opts: -Dskip.karaf.featureTest=true
       - boron:
+          # Only run once a week since Boron is in maintenance mode
+          cron: 'H H * * 0'
           next-release-tag: Boron-SR4
           branch: 'stable/boron'
           jdk: 'openjdk8'
@@ -34,28 +37,6 @@
         patches.tar.gz
         error.log.gz
 
-
-- project:
-    name: autorelease-release-notes
-    jobs:
-      - 'autorelease-generate-release-notes-{stream}'
-
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jdk: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
-
-    project: 'releng/autorelease'
-    archive-artifacts: >
-        **/*.log
-
-
 ###
 # TODO: Remove this job once guava21 testing is complete
 ###
@@ -194,7 +175,7 @@
           goals: '-version'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - wipe-local-maven-repo
       - jacoco-nojava-workaround
@@ -202,7 +183,7 @@
       - autorelease-determine-merge-order
       - autorelease-cfp:
           autorelease-settings: 'autorelease-settings'
-          odl-global-settings: 'odl-global-settings'
+          global-settings: 'odl-global-settings'
       - autorelease-generate-taglist
       - autorelease-distribute-taglist
       - autorelease-generate-release-patches
@@ -223,7 +204,7 @@
             - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - autorelease-maven-deploy
       - autorelease-get-integration-test-variables
@@ -231,7 +212,7 @@
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
           maven-version: 'mvn33'
           settings: 'autorelease-settings'
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
       - autorelease-maven-sources-post-process
       - shell: |
           mkdir -p archives/
@@ -246,5 +227,4 @@
             condition: UNSTABLE_OR_BETTER
             property-file: variables.jenkins-trigger
             fail-on-missing: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish