[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST v2 09/12] mfi-common: Set di_version for build & test host install
This means that bisections will use the same version, even if production-config changed in the mean time. Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> --- v2: s/diversion/di_version/ Moved to same model of setting $def... as used for the suites. Dropped ack due to change to $def... --- make-flight | 4 +++- mfi-common | 15 +++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/make-flight b/make-flight index e9cad0a..e0d9e0c 100755 --- a/make-flight +++ b/make-flight @@ -33,7 +33,9 @@ flight=`./cs-flight-create $blessing $branch` defsuite=`getconfig DebianSuite` defguestsuite=`getconfig GuestDebianSuite` -guest_di_version=`getconfig TftpDiVersion` +defdi_version=`getconfig TftpDiVersion` + +guest_di_version=$defdi_version case "$branch" in xen-unstable-smoke) diff --git a/mfi-common b/mfi-common index 1fcdb98..30c9d80 100644 --- a/mfi-common +++ b/mfi-common @@ -80,7 +80,7 @@ create_build_jobs () { local arch local pvops_kernel pvops_kconfig_overrides - local suite hostos_runvars + local suite di_version hostos_runvars local want_xend build_defxend build_extraxend local enable_ovmf local build_hostflags @@ -120,10 +120,10 @@ create_build_jobs () { esac case "$arch" in - *) suite=$defsuite;; + *) suite=$defsuite; di_version=$defdi_version;; esac - hostos_runvars="all_host_suite=$suite" + hostos_runvars="all_host_suite=$suite all_host_di_version=$di_version" # In 4.4 onwards xend is off by default. If necessary we build a # separate set of binaries with xend enabled in order to run those @@ -351,7 +351,7 @@ usual_debianhvm_image () { # Provides various convenience variables for the callback. # test_matrix_iterate () { - local suite guestsuite hostos_runvars + local suite guestsuite di_version hostos_runvars case "$xenbranch" in xen-3.*-testing) pairtoolstack=xend ;; @@ -402,10 +402,13 @@ test_matrix_iterate () { esac case "$xenarch" in - *) suite=$defsuite; guestsuite=$defguestsuite;; + *) suite=$defsuite + guestsuite=$defguestsuite + di_version=$defdi_version + ;; esac - hostos_runvars="all_host_suite=$suite" + hostos_runvars="all_host_suite=$suite all_host_di_version=$di_version" for kern in ''; do -- 2.6.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |