Use make verify only after its working and not for CSIT builds.

[ci-management.git] / jjb / csit / csit-vpp-honeycomb.yaml

diff --git a/jjb/csit/csit-vpp-honeycomb.yaml b/jjb/csit/csit-vpp-honeycomb.yaml
index 01235df..715d2dd 100644 (file)
--- a/jjb/csit/csit-vpp-honeycomb.yaml
+++ b/jjb/csit/csit-vpp-honeycomb.yaml
@@ -1,8 +1,8 @@
 - project:
-    name: csit-honeycomb
-    description: 'CSIT jenkins jobs to test Honeycomb features.'
+    name: csit-hc2vpp
+    description: 'CSIT jenkins jobs to test Hc2vpp features.'
     jobs:
-        - 'csit-honeycomb-functional-{stream}-{os}'
+        - 'csit-hc2vpp-functional-{stream}-{os}'
     project: 'csit'
     branch: 'master'
     branch-id: 'master'
@@ -10,12 +10,15 @@
     stream:
         - master:
             branch: 'master'
-            branch-id: 'master'
+            repo-stream-part: 'master'
+        - '1609':
+            branch: 'stable/1609'
+            repo-stream-part: 'stable.1609'
     os:
         - ubuntu1404
 
 - job-template:
-    name: 'csit-honeycomb-functional-{stream}-{os}'
+    name: 'csit-hc2vpp-functional-{stream}-{os}'
 
     project-type: freestyle
     node: verify
@@ -32,24 +35,34 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+
+    scm:
+        - git-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            branch: '{branch}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
-        - build-result:
-            combine: false
-            groups:
-                - jobs:
-                    - honeycomb-merge-{stream}-{os}
-                  results:
-                    - success
+        - reverse:
+            jobs: 'hc2vpp-integration-{stream}-{os}'
+            result: 'success'
+
+    prebuilders:
+        - shell: |
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-csit-honeycomb-functional-virl.sh
+            !include-raw-escape: include-raw-csit-hc2vpp-functional-virl.sh
+
+    postbuilders:
+        - shell: |
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64||echo 'ignoring failure';fi
 
     publishers:
         - archive-artifacts: