Sodium branch cutting

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

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 6febcdaf4909be280c8115cee3a6eb50d18eb2c4..2778218c60f8369b93e3ddce71e6fe73fefefccd 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: lispflowmapping-sodium
+    name: lispflowmapping-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -14,7 +14,7 @@
             - openjdk8
             - openjdk11
 
-    stream: sodium
+    stream: magnesium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
@@ -33,7 +33,7 @@
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-neon
+    name: lispflowmapping-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -47,10 +47,10 @@
             - openjdk8
             - openjdk11
 
-    stream: neon
+    stream: sodium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
@@ -66,7 +66,7 @@
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-fluorine
+    name: lispflowmapping-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -75,12 +75,15 @@
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs
+      - odl-maven-jobs:
+          java-version:
+            - openjdk8
+            - openjdk11
 
-    stream: fluorine
+    stream: neon
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
@@ -96,16 +99,21 @@
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-oxygen
+    name: lispflowmapping-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: lispflowmapping
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
+          rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
@@ -116,7 +124,7 @@
         **/target/surefire-reports/*-output.txt
 
     build-node: centos7-builder-8c-8g
-    disable-job: true
+
     # Used by the release job
     staging-profile-id: 96fff2503b766