X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-projects.yaml;h=65a4c9f741efc132d7e5b0ba585ce28be63285c9;hb=3ff072511ecacd6a002ef166b097d7386a861afe;hp=f842d22bfb0df9e8910baed90adedd4ad62f5109;hpb=df6379a1c71fa46278ea50a45747347c5460ea6f;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index f842d22bf..65a4c9f74 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -1,59 +1,29 @@
 ---
-- project:
-    name: autorelease-projects
-    jobs:
-      - autorelease-branch-cut
-      - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-builder-4c-16g
-      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}'
-
-    stream:
-      - sodium:
-          branch: 'stable/sodium'
-          integration-test: sodium
-          cron: '@weekly'
-
-    project: releng/autorelease
-    project-name: autorelease
-    build-node: centos7-builder-2c-8g
-    # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-    staging-profile-id: 425e43800fea70
-    # TODO: **/*.hprof is too large, compress with xz first
-    mvn-params: >
-        -PrepoBuild
-        -P!karaf
-        -Pignore-lispflowmapping-integrationtest
-        -Dcheckstyle.skip=true
-        -Dskip.karaf.featureTest=true
-        -Dsft.heap.max=4g
-    java-version: openjdk8
-
 - project:
     name: autorelease-projects-openjdk11
     jobs:
-      - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
+      - autorelease-branch-cut
+      - "autorelease-generate-release-notes-{stream}"
+      - "autorelease-release-{stream}-{mvn-version}-{java-version}":
           build-node: centos7-builder-4c-16g
-      - 'autorelease-update-submodules-{stream}'
-      - 'autorelease-update-validate-jobs-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}'
+      - "autorelease-update-submodules-{stream}"
+      - "autorelease-update-validate-jobs-{stream}"
+      - "{project-name}-validate-autorelease-{stream}"
+      - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}"
       - gerrit-tox-verify
 
     stream:
+      - phosphorus:
+          branch: "master"
+          integration-test: silicon
+      - silicon:
+          branch: "stable/silicon"
+          integration-test: silicon
       - aluminium:
-          branch: 'master'
+          branch: "stable/aluminium"
           integration-test: aluminium
       - magnesium:
-          branch: 'stable/magnesium'
+          branch: "stable/magnesium"
           integration-test: magnesium
 
     project: releng/autorelease
@@ -61,22 +31,22 @@
     build-node: centos7-builder-2c-8g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml
     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
     mvn-params: >
-        -PrepoBuild
-        -P!karaf
-        -Pignore-lispflowmapping-integrationtest
-        -Dcheckstyle.skip=true
-        -Dskip.karaf.featureTest=true
-        -Dsft.heap.max=4g
-    java-version: 'openjdk11'
+      -PrepoBuild
+      -P!karaf
+      -Pignore-lispflowmapping-integrationtest
+      -Dcheckstyle.skip=true
+      -Dskip.karaf.featureTest=true
+      -Dsft.heap.max=4g
+    java-version: "openjdk11"
 
 - project:
     name: autorelease-info