From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [OSSTEST v6 21/24] mfi-common: Allow make-*flight to filter the set of build jobs to include Date: Wed, 6 May 2015 10:56:50 +0100 Message-ID: <1430906213-30108-21-git-send-email-ian.campbell@citrix.com> References: <1430905605.2660.187.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1430905605.2660.187.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org By using the same job_create_build(_filter_callback) scheme used for the test jobs. Will be used in make-distros-flight. Signed-off-by: Ian Campbell --- make-distros-flight | 4 ++++ make-flight | 4 ++++ mfi-common | 21 +++++++++++++++------ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/make-distros-flight b/make-distros-flight index e3ec8f7..2724dd2 100755 --- a/make-distros-flight +++ b/make-distros-flight @@ -33,6 +33,10 @@ flight=`./cs-flight-create $blessing $branch` defsuite=`getconfig DebianSuite` defguestsuite=`getconfig GuestDebianSuite` +job_create_build_filter_callback () { + : +} + if [ x$buildflight = x ]; then WANT_XEND=false REVISION_LINUX_OLD=disable diff --git a/make-flight b/make-flight index c923f21..ef1e422 100755 --- a/make-flight +++ b/make-flight @@ -34,6 +34,10 @@ flight=`./cs-flight-create $blessing $branch` defsuite=`getconfig DebianSuite` defguestsuite=`getconfig GuestDebianSuite` +job_create_build_filter_callback () { + : +} + if [ x$buildflight = x ]; then create_build_jobs diff --git a/mfi-common b/mfi-common index a9e966f..a100afb 100644 --- a/mfi-common +++ b/mfi-common @@ -54,6 +54,15 @@ xenbranch_xsm_variants () { esac } +job_create_build () { + job_create_build_filter_callback "$@" || return 0 + + local job=$1; shift + local recipe=$1; shift + + ./cs-job-create $flight $job $recipe "$@" +} + create_build_jobs () { local arch @@ -164,7 +173,7 @@ create_build_jobs () { else xsm_suffix="" fi - ./cs-job-create $flight build-$arch$xsm_suffix build \ + job_create_build build-$arch$xsm_suffix build \ arch=$arch enable_xend=$build_defxend enable_ovmf=$enable_ovmf\ enable_xsm=$enable_xsm \ tree_qemu=$TREE_QEMU \ @@ -183,7 +192,7 @@ create_build_jobs () { done if [ $build_extraxend = "true" ] ; then - ./cs-job-create $flight build-$arch-xend build \ + job_create_build build-$arch-xend build \ arch=$arch enable_xend=true enable_ovmf=$enable_ovmf \ tree_qemu=$TREE_QEMU \ tree_qemuu=$TREE_QEMU_UPSTREAM \ @@ -196,7 +205,7 @@ create_build_jobs () { revision_qemuu=$REVISION_QEMU_UPSTREAM fi - ./cs-job-create $flight build-$arch-pvops build-kern \ + job_create_build build-$arch-pvops build-kern \ arch=$arch kconfighow=xen-enable-xen-config \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars \ $suite_runvars \ @@ -208,7 +217,7 @@ create_build_jobs () { if [ "x$REVISION_LIBVIRT" != xdisable ]; then - ./cs-job-create $flight build-$arch-libvirt build-libvirt \ + job_create_build build-$arch-libvirt build-libvirt \ arch=$arch \ tree_xen=$TREE_XEN \ $RUNVARS $BUILD_RUNVARS $BUILD_LIBVIRT_RUNVARS $arch_runvars \ @@ -223,7 +232,7 @@ create_build_jobs () { case $arch in i386|amd64) - ./cs-job-create $flight build-$arch-rumpuserxen build-rumpuserxen \ + job_create_build build-$arch-rumpuserxen build-rumpuserxen \ arch=$arch \ tree_xen=$TREE_XEN \ $RUNVARS $BUILD_RUNVARS $BUILD_RUMPUSERXEN_RUNVARS $arch_runvars \ @@ -252,7 +261,7 @@ create_build_jobs () { if [ "x$REVISION_LINUX_OLD" != xdisable ]; then - ./cs-job-create $flight build-$arch-oldkern build-kern \ + job_create_build build-$arch-oldkern build-kern \ arch=$arch kconfighow=create-config-sh \ kimagefile=vmlinux \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_OLD_RUNVARS \ -- 2.1.4