Merge "Exclude yangide from builder-check-poms"

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

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index e37e20d8bc7138d92fc3bb212650a88a110fb1b0..f103c6c0b0c6496a011bbbdf6ccfb6a99da9d67f 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -44,8 +42,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -58,7 +54,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -90,39 +86,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[reservation]'
-    archive-artifacts: ''
-
-- project:
-    name: reservation-lithium
-    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:
-        - stable-lithium:
-            disabled: true
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'