Merge "Auto Update CSIT Jobs to run for silicon"

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

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 24c8ef7f676567787772022efe73acd8fc456a56..32a4ec7f89164144cdc26f0237c8a9ce7447662c 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,24 +1,23 @@
 ---
 - project:
-    name: l2switch-aluminium
+    name: l2switch-silicon
     jobs:
-      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'master'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
+    stream: silicon
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "master"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"
     dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream}
+    email-upstream: "[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]"
     disable-job: true
 
     # Used by the release job
@@ -31,61 +30,57 @@
       - odl-maven-verify-jobs
 
     stream: magnesium
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/magnesium'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "stable/magnesium"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"
     dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream}
+    email-upstream: "[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]"
     disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-sodium
+    name: l2switch-release-management
     jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - gerrit-release-merge
 
-    stream: sodium
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/sodium'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    disable-job: true
+    project: l2switch
+    project-name: l2switch
 
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
+    build-node: centos7-builder-2c-1g
+    mvn-settings: l2switch-settings
 
 - project:
     name: l2switch-sonar
     jobs:
       - gerrit-maven-sonar
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'master'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "master"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"
     disable-job: true
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+
+- project:
+    name: l2switch-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: l2switch
+    project-name: l2switch
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: l2switch-view