Merge "HC2VPP-372: Update HC2VPP jobs for bionic"

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

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 8ffe036..3210265 100644 (file)
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -8,10 +8,14 @@
       - 'hc2vpp-verify-image-{stream}-{os}'
     project: 'hc2vpp'
     os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
           skip-site: 'false'
           skip-jar-deploy: 'false'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
+          skip-site: 'true'
+          skip-jar-deploy: 'true'
       - centos7:
           repo-os-part: 'centos7'
           skip-site: 'true'
@@ -20,18 +24,21 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '1801':
-          branch: 'stable/1801'
-          repo-stream-part: 'stable.1801'
-      - '1804':
-          branch: 'stable/1804'
-          repo-stream-part: 'stable.1804'
       - '1807':
           branch: 'stable/1807'
           repo-stream-part: 'stable.1807'
       - '1810':
           branch: 'stable/1810'
           repo-stream-part: 'stable.1810'
+      - '1901':
+          branch: 'stable/1901'
+          repo-stream-part: 'stable.1901'
+
+- project:
+    name: hc2vpp-view
+    views:
+      - project-view
+    project-name: hc2vpp
 
 - job-template:
     name: 'hc2vpp-verify-{stream}-{os}'
@@ -264,7 +271,7 @@
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-{os},hc2vpp-merge-{stream}-{os}'
+          jobs: 'jvpp-merge-{stream}-{os},hc2vpp-merge-{stream}-{os}'
           result: 'success'
 
     prebuilders: