From: Ed Warnicke <hagbard@gmail.com>
Date: Mon, 17 Oct 2016 17:57:30 +0000 (+0000)
Subject: Merge "Remove unnecessary ssh-credentials defaults"
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=2d286c0bfff820a47ba091d3952c6f3c6c7daa9d;hp=61ff560afc8381d983571ad7395c4d9db1ca998f;p=ci-management.git

Merge "Remove unnecessary ssh-credentials defaults"
---

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 7247ce2b9..bf037d58f 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -10,6 +10,9 @@
         - ubuntu1404:
             repo-os-part: 'ubuntu.trusty.main'
             skip-site: 'false'
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
+            skip-site: 'true'
         - centos7:
             repo-os-part: 'centos7'
             skip-site: 'true'
@@ -26,6 +29,7 @@
     project-type: maven
     node: verify-{os}
     concurrent: true
+    jdk: openjdk8-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -81,6 +85,7 @@
     project-type: maven
     node: 'verify-image-{os}'
     concurrent: true
+    jdk: openjdk8-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -209,6 +214,7 @@
     name: 'honeycomb-integration-{stream}-{os}'
     project-type: maven
     node: merge-{os}
+    jdk: openjdk8-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
diff --git a/jjb/honeycomb/include-raw-honeycomb-pkg-push.sh b/jjb/honeycomb/include-raw-honeycomb-pkg-push.sh
index 53ef2ca85..db10e19dc 100644
--- a/jjb/honeycomb/include-raw-honeycomb-pkg-push.sh
+++ b/jjb/honeycomb/include-raw-honeycomb-pkg-push.sh
@@ -14,8 +14,19 @@ if [ "${OS}" == "centos7" ]; then
     done
 elif [ "${OS}" == "ubuntu1404" ]; then
 
-    # Build the rpms
-    ./packaging/deb/debuild.sh
+    # Build the debs
+    ./packaging/deb/trusty/debuild.sh
+
+    # Find the files
+    DEBS=$(find . -type f -iname '*.deb')
+    for i in $DEBS
+    do
+        push_deb "$i"
+    done
+elif [ "${OS}" == "ubuntu1604" ]; then
+
+    # Build the debs
+    ./packaging/deb/xenial/debuild.sh
 
     # Find the files
     DEBS=$(find . -type f -iname '*.deb')
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 587b68543..3310efb93 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -37,6 +37,7 @@
     jobs:
         - 'vpp-csit-verify-virl-{stream}'
         - 'vpp-csit-verify-hw-perf-{stream}-{type}'
+        - 'vpp-csit-verify-virl-1604-test-{stream}'
     project: 'vpp'
     stream:
         - master:
@@ -111,6 +112,72 @@
             only-if-success: true
             default-excludes: false
 
+- job-template:
+    name: 'vpp-csit-verify-virl-1604-test-{stream}'
+
+    project-type: freestyle
+    node: 'verify-ubuntu1404'
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: 'ubuntu1404'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'virl-1604-test'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
+    builders:
+        - shell:
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - shell:
+            !include-raw-escape: include-raw-vpp-build.sh
+    publishers:
+        - archive:
+            artifacts: 'build-root/*.rpm,build-root/*.deb'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
+
 - job-template:
     name: 'vpp-verify-image-{stream}-{os}'