Merge "Add INFO.yaml verify job"

[ci-management.git] / jjb / sweetcomb / sweetcomb.yaml

diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index 9be3f05..3f58ccd 100644 (file)
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -20,14 +20,12 @@
     jobs:
       - 'sweetcomb-verify-{stream}-{os}'
       - 'sweetcomb-merge-{stream}-{os}'
-      - 'sweetcomb-test-{stream}-{os}'
+      #- 'sweetcomb-test-{stream}-ubuntu1604'
 
     project: 'sweetcomb'
     os:
       - ubuntu1604:
           repo-os-part: 'ubuntu.xenial.main'
-      - ubuntu1804:
-          repo-os-part: 'ubuntu.bionic.main'
       - centos7:
           repo-os-part: 'centos7'
     stream:
@@ -40,6 +38,9 @@
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
+      - vom:
+          branch: 'vom'
+          repo-stream-part: 'vom'
 
 - project:
     name: sweetcomb-view
@@ -201,10 +202,10 @@
           fixed-delay: 90
 
 - job-template:
-    name: 'sweetcomb-test-{stream}-{os}'
+    name: 'sweetcomb-test-{stream}-ubuntu1604'
 
     project-type: freestyle
-    node: '{os}-us'
+    node: 'ubuntu1604-us'
     concurrent: true
 
     build-discarder:
@@ -225,9 +226,9 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: '{os}'
+          os: 'ubuntu1604'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.{repo-os-part}'
+          repo-name: '{repo-stream-part}.ubuntu.xenial.main'
       - stream-parameter:
           stream: '{stream}'
 
@@ -266,3 +267,12 @@
           rerun-unstable-builds: false
           max-failed-builds: 1
           fixed-delay: 90
+
+- project:
+    name: sweetcomb-info
+    project-name: sweetcomb
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: sweetcomb
+    branch: master