From 7d5566362ce88fc1c473945b261f11188ab5cce5 Mon Sep 17 00:00:00 2001 From: QiLiang Date: Mon, 17 Oct 2016 06:37:27 +0800 Subject: [compass] verify both trusty and centos7 JIRA: COMPASS-494 Change-Id: I05ca3ad22bfb926245ac89a8ef81f832a9b31959 Signed-off-by: QiLiang --- jjb/compass4nfv/compass-project-jobs.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'jjb/compass4nfv') diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index bede7de46..4d799af8e 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -16,19 +16,28 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' + distro: + - 'trusty': + disabled: false + os-version: 'trusty' + openstack-os-version: '' + - 'centos7': + disabled: false + os-version: 'centos7' + openstack-os-version: '' jobs: - - 'compass-verify-{stream}' + - 'compass-verify-{distro}-{stream}' - 'compass-build-iso-{stream}' - 'compass-build-ppa-{stream}' - - 'compass-verify-deploy-{stream}' + - 'compass-verify-deploy-{distro}-{stream}' ######################## # job templates ######################## - job-template: - name: 'compass-verify-{stream}' + name: 'compass-verify-{distro}-{stream}' disabled: false @@ -92,8 +101,11 @@ builders: - trigger-builds: - - project: 'compass-verify-deploy-{stream}' + - project: 'compass-verify-deploy-{distro}-{stream}' current-parameters: true + predefined-parameters: | + COMPASS_OS_VERSION={os-version} + COMPASS_OS_VERSION_OPTION={openstack-os-version} same-node: true block: true - trigger-builds: @@ -109,7 +121,7 @@ unstable-threshold: 'FAILURE' - job-template: - name: 'compass-verify-deploy-{stream}' + name: 'compass-verify-deploy-{distro}-{stream}' concurrent: true -- cgit 1.2.3-korg