Merge "Revert OpenJDK 10/11 install thru local builder"

[releng/builder.git] / jjb / of-config / of-config.yaml

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index ab6c67a89b40ab759e512f3bc5cbd19e5bc0ad88..7e896845dbabdc1c14ca5d2b6eb195207465bca2 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,80 +1,71 @@
 ---
 - project:
-    name: of-config-oxygen
+    name: of-config-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: sodium
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-nitrogen
+    name: of-config-neon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: neon
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/neon'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-carbon
+    name: of-config-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'stable/fluorine'
+    mvn-settings: 'of-config-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
+
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
+- project:
+    name: of-config-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
+    disable-job: true
     # Used by the release job
     staging-profile-id: a6880455efe67
 
@@ -86,5 +77,10 @@
     project-name: 'of-config'
     branch: 'master'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: of-config-view
+    views:
+      - project-view
+    project-name: of-config