Merge "Migrate infrautils to global-jjb Maven jobs"

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

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index e2435af9f3c043fdf9e9ba5ccf0f6dc38eb47d31..26a6dde3e50047cd62669008274efe4d26072405 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: ttp-nitrogen
+    name: ttp-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -8,11 +8,10 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,21 +25,18 @@
     archive-artifacts: ''
 
 - project:
-    name: ttp-carbon
+    name: ttp-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: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -54,21 +50,19 @@
     archive-artifacts: ''
 
 - project:
-    name: ttp-boron
+    name: ttp-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: 'ttp'
     project-name: 'ttp'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven: