Merge "Add job to comprehensively test RPM building logic"

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

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index a9acc22d327a7eefe9042ad33e28ab77a168bcc9..10cb7dd2446e52c2690e4d86590f7401cc7bea6c 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: lacp-nitrogen
+    name: lacp-oxygen
     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: nitrogen
+    stream: oxygen
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'
@@ -27,19 +26,18 @@
     archive-artifacts: ''
 
 - project:
-    name: lacp-carbon
+    name: lacp-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: 'lacp'
     project-name: 'lacp'
-    branch: 'stable/carbon'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -54,19 +52,19 @@
     archive-artifacts: ''
 
 - project:
-    name: lacp-boron
+    name: lacp-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: 'lacp'
     project-name: 'lacp'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -80,34 +78,6 @@
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
-- project:
-    name: lacp-beryllium
-    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
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    mvn-settings: 'lacp-settings'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
-
 - project:
     name: lacp-sonar
     jobs: