diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2017-02-14 17:34:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-02-14 17:34:14 +0000 |
| commit | 7c9a6c112a0c89e19132ca045a28760805234ec8 (patch) | |
| tree | 9a24bf6fe64cffeb76be6e1e1cfe561b6aafd413 | |
| parent | db300c0dcceb1fe54dbd424c7f622a4d1e509ff6 (diff) | |
| parent | a926f1a70522330e16c6e614fc55e89edd7185ca (diff) | |
Merge "Add hc2vpp-csit jobs on Ubuntu16.04"
| -rw-r--r-- | jjb/hc2vpp/csit-hc2vpp.yaml | 6 | ||||
| -rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh | 4 | ||||
| -rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh | 4 | ||||
| -rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/jjb/hc2vpp/csit-hc2vpp.yaml b/jjb/hc2vpp/csit-hc2vpp.yaml index 1e70c3252..145952fa7 100644 --- a/jjb/hc2vpp/csit-hc2vpp.yaml +++ b/jjb/hc2vpp/csit-hc2vpp.yaml @@ -16,12 +16,14 @@ os: - ubuntu1404: repo-os-part: 'ubuntu.trusty.main' + - ubuntu1604: + repo-os-part: 'ubuntu.xenial.main' - job-template: name: 'hc2vpp-csit-integration-{stream}-{os}' project-type: freestyle - node: 'ubuntu1404-basebuild-4c-4g' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -78,7 +80,7 @@ name: 'hc2vpp-csit-verify-{stream}-{os}' project-type: maven - node: 'ubuntu1404-basebuild-4c-4g' + node: '{os}-basebuild-4c-4g' jdk: openjdk8-{os} concurrent: true diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh index 915ca8cf4..14ce67029 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh @@ -25,9 +25,9 @@ else chmod +x bootstrap-hc2vpp-integration.sh # run the script if [ ${STREAM} == 'master' ]; then - ./bootstrap-hc2vpp-integration.sh ${STREAM} + ./bootstrap-hc2vpp-integration.sh ${STREAM} ${OS} else - ./bootstrap-hc2vpp-integration.sh 'stable.'${STREAM} + ./bootstrap-hc2vpp-integration.sh 'stable.'${STREAM} ${OS} fi fi diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh index f3c3bb0c8..0384a467c 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh @@ -23,9 +23,9 @@ fi cd csit if [ ${STREAM} == 'master' ]; then - ./csit/resources/tools/download_hc_build_pkgs.sh ${STREAM} + ./csit/resources/tools/download_hc_build_pkgs.sh ${STREAM} ${OS} else - ./csit/resources/tools/download_hc_build_pkgs.sh 'stable.'${STREAM} + ./csit/resources/tools/download_hc_build_pkgs.sh 'stable.'${STREAM} ${OS} fi cd ${current_dir} diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh index 9cfc2c586..99b8d3fa8 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh @@ -23,7 +23,7 @@ else # make sure that bootstrap.sh is executable chmod +x bootstrap-hc2vpp-verify.sh # run the script - ./bootstrap-hc2vpp-verify.sh + ./bootstrap-hc2vpp-verify.sh ${OS} fi # vim: ts=4 ts=4 sts=4 et :
\ No newline at end of file |