diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-04-12 16:08:35 -0500 |
|---|---|---|
| committer | Ed Warnicke <eaw@cisco.com> | 2016-04-12 16:32:52 -0500 |
| commit | 3c5c70b649df27c0ce2b876153069cd72eccee2c (patch) | |
| tree | 6ff2ce8dfdafa03613b7ceedc9141d28aa70c7be | |
| parent | 32dd310e08657c22ddf2d8c9544b9caf7ba168e9 (diff) | |
Machinery for multi-os build.
This patch should provide machinery for multi os build
It also provides machinery for multi-branch build
Change-Id: I29db20f159f18af2cab512ab6df6b03d9f81ff15
Signed-off-by: Ed Warnicke <eaw@cisco.com>
| -rw-r--r-- | jjb/global-macros.yaml | 8 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 12 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 10 |
3 files changed, 24 insertions, 6 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 8e7878b5e..6dc0e0fcb 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -26,6 +26,14 @@ description: "GERRIT_PROJECT parameter if not given by trigger" - parameter: + name: os-parameter + parameters: + - string: + name: OS + default: '{os}' + description: "OS parameter" + +- parameter: name: gerrit-refspec-parameter parameters: - string: diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index f3cb320bd..fa5336ecc 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -10,6 +10,12 @@ if [ -d $CCACHE_DIR ];then else echo $CCACHE_DIR does not exist. This must be a new slave. fi -cd build-root/ -./bootstrap.sh -make PLATFORM=vpp V=0 TAG=vpp install-deb + +if [ ${OS} == "ubuntu1404" ]; then + cd build-root/ + ./bootstrap.sh + make PLATFORM=vpp V=0 TAG=vpp install-deb +else + echo "Unrecognized OS: ${OS}. Please edit: https://gerrit.fd.io/r/gitweb?p=ci-management.git;a=blob;f=jjb/vpp/include-raw-vpp-build.sh;h=f3cb320bd9a2515eab0c4564c927764c9dad417d;hb=HEAD" + exit 1 +fi
\ No newline at end of file diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index a9cf43de4..4f90957ef 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -1,22 +1,24 @@ - project: name: vpp jobs: - - 'vpp-verify' + - 'vpp-verify-{branch}-{os}' - 'vpp-merge' - 'vpp-csit-verify-virl' - 'vpp-verify-performance-{type}' project: 'vpp' + os: + - ubuntu1404 branch: 'master' type: - short - long - job-template: - name: vpp-verify + name: 'vpp-verify-{branch}-{os}' project-type: freestyle - node: verify + node: 'verify-{os}' concurrent: true logrotate: @@ -30,6 +32,8 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' + - os-parameter: + os: '{os}' scm: - gerrit-trigger-scm: |