| Message ID | 1452263399-14094-11-git-send-email-ian.campbell@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Ian Campbell writes ("[PATCH RFC OSSTEST v1 11/12] mfi-common: usual_debianhvm_image: derive version from $guestsuite"):
> This more likely matches the callers intention.
>
> Move the setting into production-config* alongside the Suite and
> TftpDiVersion settings. Continue to support $DEBIAN_IMAGE_VERSION as an
> override. The value for Wheezy is from what was replaced
> in 610ea1628363 "Switch to Debian 8.0 (jessie) as OS for test hosts".
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
diff --git a/mfi-common b/mfi-common index 1daa6dd..82f0503 100644 --- a/mfi-common +++ b/mfi-common @@ -347,7 +347,11 @@ job_create_test () { usual_debianhvm_image () { local arch=$1; shift - echo debian-${DEBIAN_IMAGE_VERSION-8.2.0}-$arch-CD-1.iso + local ver=$DEBIAN_IMAGE_VERSION + if [ -z "$ver" ] ; then + ver=`getconfig DebianImageVersion_$guestsuite` + fi + echo debian-$ver-$arch-CD-1.iso } # Iterate over xenarch, dom0arch and kernel calling test_matrix_do_one diff --git a/production-config b/production-config index 42948c8..21b215d 100644 --- a/production-config +++ b/production-config @@ -90,6 +90,10 @@ TftpPxeGroup osstest TftpDiVersion_wheezy 2015-09-07 TftpDiVersion_jessie 2015-09-18 +# For ISO installs +DebianImageVersion_wheezy 7.2.0 +DebianImageVersion_jessie 8.2.0 + # These should normally be the same. # Update with ./mg-cpu-microcode-update MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio diff --git a/production-config-cambridge b/production-config-cambridge index 78d606b..a9be7a8 100644 --- a/production-config-cambridge +++ b/production-config-cambridge @@ -72,6 +72,10 @@ TftpPxeGroup osstest TftpDiVersion_wheezy 2015-09-07 TftpDiVersion_jessie 2015-09-18 +# For ISO installs +DebianImageVersion_wheezy 7.2.0 +DebianImageVersion_jessie 8.2.0 + # These should normally be the same. MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio MicrocodeUpdateI386 microcode.x86.2015-06-12.cpio
This more likely matches the callers intention. Move the setting into production-config* alongside the Suite and TftpDiVersion settings. Continue to support $DEBIAN_IMAGE_VERSION as an override. The value for Wheezy is from what was replaced in 610ea1628363 "Switch to Debian 8.0 (jessie) as OS for test hosts". Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- mfi-common | 6 +++++- production-config | 4 ++++ production-config-cambridge | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-)