X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-projects.yaml;h=ffb06f79e2b96d71c327c6c9b9500b8d45e80b98;hb=e0bd0b45eb352a3ae8b14e477087bf9188681889;hp=c00cfb15c6e6e138382877cb36b822d9bc3a26af;hpb=3f26f0d97606964d92ae8ef8b05c911a40f58e19;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index c00cfb15c..ffb06f79e 100644
--- 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:
@@ -11,28 +12,21 @@
           branch: 'master'
           jdk: 'openjdk8'
           integration-test: nitrogen
-          karaf-version: karaf3
       - carbon:
           next-release-tag: Carbon
           branch: 'stable/carbon'
           jdk: 'openjdk8'
           integration-test: carbon
           karaf-version: karaf3
-          extra-mvn-opts: -Dskip.karaf.featureTest=true
+          extra-mvn-opts: -Dskip.karaf4.featureTest=true
       - boron:
-          next-release-tag: Boron-SR4
+          # Only run once a week since Boron is in maintenance mode
+          cron: 'H H * * 0'
+          next-release-tag: Boron-SR5
           branch: 'stable/boron'
           jdk: 'openjdk8'
           integration-test: boron
           karaf-version: karaf3
-      - beryllium:
-          # Only run once a week since Beryllium is in maintenance mode
-          cron: 'H H * * 0'
-          next-release-tag: Beryllium-SR5
-          branch: 'stable/beryllium'
-          jdk: 'openjdk7'
-          integration-test: beryllium
-          karaf-version: karaf3
 
     project: 'releng/autorelease'
     archive-artifacts: >
@@ -42,28 +36,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
 ###
@@ -202,7 +174,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
@@ -210,7 +182,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
@@ -231,7 +203,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
@@ -239,7 +211,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/
@@ -254,5 +226,4 @@
             condition: UNSTABLE_OR_BETTER
             property-file: variables.jenkins-trigger
             fail-on-missing: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish