diff options
author | selias <samelias@cisco.com> | 2016-12-08 10:53:03 +0100 |
---|---|---|
committer | Samuel Eliáš <samelias@cisco.com> | 2016-12-08 14:12:23 +0000 |
commit | c96e29af295322912aad05b3170a639f0ffefc51 (patch) | |
tree | fcd39c2e424fe36d1ac5b94808b25b863e3a0836 /jjb/csit | |
parent | 973644b29942fe044da2f3507b99b86b67a73658 (diff) |
CSIT-484: New csit-hc2vpp job set
Removes obsolete csit-hc2vpp job and adds 2 new jobs:
- hc2vpp-csit-integration - runs on master after hc2vpp-integration succeeds
- hc2vpp-csit-verify - can be run manually on commits to hc2vpp project
Related csit change - https://gerrit.fd.io/r/4170
Change-Id: I0552c593e7080351e1d53c4b0b0d5a7aeb21089d
Signed-off-by: selias <samelias@cisco.com>
Diffstat (limited to 'jjb/csit')
-rw-r--r-- | jjb/csit/csit-vpp-honeycomb.yaml | 73 | ||||
-rw-r--r-- | jjb/csit/include-raw-csit-hc2vpp-functional-virl.sh | 15 |
2 files changed, 0 insertions, 88 deletions
diff --git a/jjb/csit/csit-vpp-honeycomb.yaml b/jjb/csit/csit-vpp-honeycomb.yaml deleted file mode 100644 index 715d2ddc3..000000000 --- a/jjb/csit/csit-vpp-honeycomb.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- project: - name: csit-hc2vpp - description: 'CSIT jenkins jobs to test Hc2vpp features.' - jobs: - - 'csit-hc2vpp-functional-{stream}-{os}' - project: 'csit' - branch: 'master' - branch-id: 'master' - build-artifact-num-to-keep: 10 - stream: - - master: - branch: 'master' - repo-stream-part: 'master' - - '1609': - branch: 'stable/1609' - repo-stream-part: 'stable.1609' - os: - - ubuntu1404 - -- job-template: - name: 'csit-hc2vpp-functional-{stream}-{os}' - - project-type: freestyle - node: verify - 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: '{os}' - - scm: - - git-scm: - credentials-id: 'jenkins-gerrit-credentials' - branch: '{branch}' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - 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-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: - artifacts: 'report.html, log.html, output.xml' - latest-only: false - - - robot-report: - output-path: '' diff --git a/jjb/csit/include-raw-csit-hc2vpp-functional-virl.sh b/jjb/csit/include-raw-csit-hc2vpp-functional-virl.sh deleted file mode 100644 index 8c2fa9765..000000000 --- a/jjb/csit/include-raw-csit-hc2vpp-functional-virl.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# execute csit bootstrap script if it exists -if [ ! -e bootstrap-vpp-honeycomb.sh ] -then - echo 'ERROR: No bootstrap-vpp-honeycomb.sh found' - exit 1 -else - # make sure that bootstrap.sh is executable - chmod +x bootstrap-vpp-honeycomb.sh - # run the script - ./bootstrap-vpp-honeycomb.sh -fi - -# vim: ts=4 ts=4 sts=4 et : |