diff options
| author |   Michal Cmarada <mcmarada@cisco.com> | 2019-02-21 13:29:02 +0100 |
|---|---|---|
| committer | Michal Cmarada <mcmarada@cisco.com> | 2019-03-01 13:34:34 +0100 |
| commit | d413dc3675832f38cf3a3dfc8dae816da16472f1 (patch) | |
| tree | a36d0d5408c2fc4c563719251591246697528160 /jjb/csit | |
| parent | bd99f3b0e54c18d8b2b0e2501a0d7b5a170cec67 (diff) | |
HC2VPP-372: Update hc2vpp integration and hc2vpp/csit jobs
- add support for ubuntu bionic
- update jobs to support package cloud download script
(csit patch: https://gerrit.fd.io/r/#/c/17779/)
- cleanup
Change-Id: I60d8af98c98612ff82ca782274d317a1726cfc7e
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'jjb/csit')
| -rw-r--r-- | jjb/csit/csit-hc2vpp.yaml | 13 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-hc2vpp-verify-func.sh | 8 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-hc2vpp-verify-perf.sh | 8 |
3 files changed, 12 insertions, 17 deletions
diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml index d230d18e6..e23c69454 100644 --- a/jjb/csit/csit-hc2vpp.yaml +++ b/jjb/csit/csit-hc2vpp.yaml @@ -4,12 +4,15 @@ description: 'jenkins jobs verify Hc2vpp functional and performance tests' jobs: - 'csit-hc2vpp-verify-func-{stream}-{os}' - - 'csit-hc2vpp-verify-perf-{stream}' + - 'csit-hc2vpp-verify-perf-{stream}-{os}' project: 'csit' branch: 'master' build-artifact-num-to-keep: 10 - os: 'ubuntu1604' - repo-os-part: 'ubuntu.xenial.main' + os: + - ubuntu1804: + repo-os-part: 'ubuntu.bionic.main' + - ubuntu1604: + repo-os-part: 'ubuntu.xenial.main' stream: - master: @@ -81,10 +84,10 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-hc2vpp-verify-perf-{stream}' + name: 'csit-hc2vpp-verify-perf-{stream}-{os}' project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: '{os}-basebuild-4c-4g' concurrent: false build-discarder: diff --git a/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh b/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh index d81c09c9b..5237e9838 100644 --- a/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh +++ b/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh @@ -1,7 +1,7 @@ #!/bin/bash # execute csit bootstrap script if it exists -if [ ! -e bootstrap-hc2vpp-integration.sh ] +if [[ ! -e bootstrap-hc2vpp-integration.sh ]] then echo 'ERROR: No bootstrap-hc2vpp-integration.sh found' exit 1 @@ -9,11 +9,7 @@ else # make sure that bootstrap.sh is executable chmod +x bootstrap-hc2vpp-integration.sh # run the script - if [ ${STREAM} == 'master' ]; then - ./bootstrap-hc2vpp-integration.sh ${STREAM} ${OS} - else - ./bootstrap-hc2vpp-integration.sh 'stable.'${STREAM} ${OS} - fi + ./bootstrap-hc2vpp-integration.sh ${STREAM} ${OS} fi # vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/csit/include-raw-csit-hc2vpp-verify-perf.sh b/jjb/csit/include-raw-csit-hc2vpp-verify-perf.sh index d9a5fb1f4..fdfdb2a13 100644 --- a/jjb/csit/include-raw-csit-hc2vpp-verify-perf.sh +++ b/jjb/csit/include-raw-csit-hc2vpp-verify-perf.sh @@ -1,7 +1,7 @@ #!/bin/bash # execute csit bootstrap script if it exists -if [ ! -e bootstrap-hc2vpp-perf.sh ] +if [[ ! -e bootstrap-hc2vpp-perf.sh ]] then echo 'ERROR: No bootstrap-hc2vpp-perf.sh found' exit 1 @@ -9,11 +9,7 @@ else # make sure that bootstrap.sh is executable chmod +x bootstrap-hc2vpp-perf.sh # run the script - if [ ${STREAM} == 'master' ]; then - ./bootstrap-hc2vpp-perf.sh ${STREAM} ${OS} - else - ./bootstrap-hc2vpp-perf.sh 'stable.'${STREAM} ${OS} - fi + ./bootstrap-hc2vpp-perf.sh ${STREAM} ${OS} fi # vim: ts=4 ts=4 sts=4 et : |