Merge "Use global-jjb tox jobs for AR version management"

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

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 496fea3e5e8d8151a97b4bde4f693c0b2751310a..f9e4ddfd2d65e4b89aea2c189198ff8593dd8694 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: faas-nitrogen
+    name: faas-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -8,7 +8,7 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
@@ -26,7 +26,7 @@
     archive-artifacts: ''
 
 - project:
-    name: faas-carbon
+    name: faas-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -34,11 +34,10 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'faas'
     project-name: 'faas'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -53,7 +52,7 @@
     archive-artifacts: ''
 
 - project:
-    name: faas-boron
+    name: faas-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -61,10 +60,10 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'faas'
     project-name: 'faas'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk8
     jdks: