Merge "Remove Lithium jobs in SFC project"

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

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 95aba6ccffbe1c17f69e4cb0c94a20f9667dadf1..24ab840082356283ebd5ca70b89ad5dad5e804ea 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -10,8 +10,8 @@
         - '{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:    release stream (eg. stable-boron or beryllium)
+    # branch:    git branch (eg. stable/boron or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -44,8 +44,8 @@
         - '{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:    release stream (eg. stable-boron or beryllium)
+    # branch:    git branch (eg. stable/boron or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -98,37 +98,6 @@
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
 
-- project:
-    name: sfc-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:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
-
 - project:
     name: sfc-sonar
     jobs: