Merge "Revert "Add refspec to validate-autorelease job""

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

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 440140cb54341f909256f9c461ad87ebba17b1d9..25dc63a15a572cbf4cd08350d38aaf11ab377583 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -1,28 +1,22 @@
+---
 - project:
-    name: discovery-carbon
+    name: discovery-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - carbon:
-            disable_autorelease: True
-            disable_distribution_check: False
+    stream: nitrogen
     project: 'discovery'
     project-name: 'discovery'
     branch: 'master'
     jdk: openjdk7
     jdks:
-        - openjdk7
+      - openjdk7
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'discovery-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -31,30 +25,24 @@
     archive-artifacts: ''
 
 - project:
-    name: discovery-boron
+    name: discovery-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - boron:
-            disable_autorelease: True
-            disable_distribution_check: False
+    stream: carbon
     project: 'discovery'
     project-name: 'discovery'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
-        - openjdk7
+      - openjdk7
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'discovery-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -63,29 +51,24 @@
     archive-artifacts: ''
 
 - project:
-    name: discovery-beryllium
+    name: discovery-boron
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - beryllium:
-            disable_autorelease: True
-            disable_distribution_check: False
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: boron
     project: 'discovery'
     project-name: 'discovery'
-    branch: 'stable/beryllium'
+    branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
-        - openjdk7
+      - openjdk7
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'discovery-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -96,7 +79,7 @@
 - project:
     name: discovery-sonar
     jobs:
-        - '{project-name}-sonar'
+      - '{project-name}-sonar'
     project: 'discovery'
     project-name: 'discovery'
     branch: 'master'