From: Ed Warnicke <hagbard@gmail.com>
Date: Mon, 17 Oct 2016 17:57:36 +0000 (+0000)
Subject: Merge "Use fdio-infra-wrappers to simplify common wrapper use"
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=ac1bfbb11515c51aa361f19a1cfed064f9f8da2f;hp=-c;p=ci-management.git

Merge "Use fdio-infra-wrappers to simplify common wrapper use"
---

ac1bfbb11515c51aa361f19a1cfed064f9f8da2f
diff --combined jjb/honeycomb/honeycomb.yaml
index bf037d58f,2348f725c..8a5011332
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@@ -10,9 -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'
@@@ -29,7 -26,6 +29,7 @@@
      project-type: maven
      node: verify-{os}
      concurrent: true
 +    jdk: openjdk8-{os}
  
      logrotate:
          daysToKeep: '{build-days-to-keep}'
@@@ -52,9 -48,6 +52,6 @@@
              choosing-strategy: 'gerrit'
  
      wrappers:
-         - ssh-agent-credentials:
-             users:
-                 - 'jenkins-gerrit-credentials'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -85,7 -78,6 +82,7 @@@
      project-type: maven
      node: 'verify-image-{os}'
      concurrent: true
 +    jdk: openjdk8-{os}
  
      logrotate:
          daysToKeep: '{build-days-to-keep}'
@@@ -108,9 -100,6 +105,6 @@@
              choosing-strategy: 'gerrit'
  
      wrappers:
-         - ssh-agent-credentials:
-             users:
-                 - 'jenkins-gerrit-credentials'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -214,7 -203,6 +208,7 @@@
      name: 'honeycomb-integration-{stream}-{os}'
      project-type: maven
      node: merge-{os}
 +    jdk: openjdk8-{os}
  
      logrotate:
          daysToKeep: '{build-days-to-keep}'
diff --combined jjb/vpp/vpp.yaml
index 3310efb93,86f8efc94..911c48496
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -37,7 -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:
@@@ -87,10 -86,6 +87,6 @@@
              choosing-strategy: 'gerrit'
  
      wrappers:
-         - timestamps
-         - ssh-agent-credentials:
-             users:
-                 - 'jenkins-gerrit-credentials'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -112,72 -107,6 +108,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}'
  
@@@ -206,10 -135,6 +202,6 @@@
              choosing-strategy: 'gerrit'
  
      wrappers:
-         - timestamps
-         - ssh-agent-credentials:
-             users:
-                 - 'jenkins-gerrit-credentials'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -268,10 -193,6 +260,6 @@@
              choosing-strategy: 'default'
  
      wrappers:
-         - timestamps
-         - ssh-agent-credentials:
-             users:
-                 - 'jenkins-gerrit-credentials'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -335,10 -256,6 +323,6 @@@
              choosing-strategy: 'gerrit'
  
      wrappers:
-         - timestamps
-         - ssh-agent-credentials:
-             users:
-                 - 'jenkins-gerrit-credentials'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -393,10 -310,6 +377,6 @@@
              choosing-strategy: 'gerrit'
  
      wrappers:
-         - timestamps
-         - ssh-agent-credentials:
-             users:
-                 - 'jenkins-gerrit-credentials'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -457,10 -370,6 +437,6 @@@
              choosing-strategy: 'gerrit'
  
      wrappers:
-         - timestamps
-         - ssh-agent-credentials:
-             users:
-                 - 'jenkins-gerrit-credentials'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -518,10 -427,6 +494,6 @@@
              choosing-strategy: 'default'
  
      wrappers:
-         - timestamps
-         - ssh-agent-credentials:
-             users:
-                 - 'jenkins-gerrit-credentials'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -566,4 -471,3 +538,3 @@@
              fingerprint: false
              only-if-success: true
              default-excludes: false
-