Merge "Migrate autorelease jobs to lf-infra-publish"

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 6c49ed8dd8b8576eea6f6810c98cc2287edcfc48..672dd969c36bdd579b3cc302c3d86720ab2073cd 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -1,15 +1,17 @@
 ---
 - project:
-    name: odlparent-carbon
+    name: odlparent-nitrogen
     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}'
+      - '{project-name}-verify-tox-{stream}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'master'
@@ -27,7 +29,7 @@
     archive-artifacts: ''
 
 - project:
-    name: odlparent-boron
+    name: odlparent-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -35,11 +37,13 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-verify-tox-{stream}'
 
-    stream: boron
+    stream: carbon
     project: 'odlparent'
     project-name: 'odlparent'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -54,7 +58,7 @@
     archive-artifacts: ''
 
 - project:
-    name: odlparent-beryllium
+    name: odlparent-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -63,13 +67,13 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: boron
     project: 'odlparent'
     project-name: 'odlparent'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: