Merge "Clean up log file size increase logic"

[releng/builder.git] / jjb / sfc / sfc.yaml

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 7d539580df00ec66eb3747be242f0994dde73f59..ed7f35edeefece9870cef50e0e9e4515a1cf96e6 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: sfc-magnesium
+    name: sfc-aluminium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
@@ -11,7 +10,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
@@ -27,21 +26,21 @@
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-sodium
+    name: sfc-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     build-timeout: 120
@@ -53,7 +52,7 @@
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-neon
+    name: sfc-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -64,10 +63,10 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     build-timeout: 120