Create Oxygen jobs and bump Nitrogen branch

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 4f44276fe95d323933628be23f36b4d6db825fa6..9c7e833c58f865de3fd14fb2fe61487b91f74211 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,16 +1,14 @@
 ---
 - project:
-    name: neutron-nitrogen
+    name: neutron-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
@@ -29,21 +27,19 @@
     archive-artifacts: ''
 
 - project:
-    name: neutron-carbon
+    name: neutron-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -58,19 +54,19 @@
     archive-artifacts: ''
 
 - project:
-    name: neutron-boron
+    name: neutron-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'neutron'
     project-name: 'neutron'
-    branch: 'stable/boron'
+    build-timeout: 60
+    branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk8
     jdks:
@@ -86,19 +82,18 @@
     archive-artifacts: ''
 
 - project:
-    name: neutron-beryllium
+    name: neutron-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: boron
     project: 'neutron'
     project-name: 'neutron'
-    branch: 'stable/beryllium'
+    branch: 'stable/boron'
     karaf-version: karaf3
     jdk: openjdk8
     jdks: