* [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests
@ 2015-09-17 17:37 Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 01/33] docs: Document OSSTEST_RESOURCE_PRIORITY values in README.planner Ian Jackson
` (32 more replies)
0 siblings, 33 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
The main difference is new arrangements for reusing previous builds
for xen-unstable-smoke. Having slept on it, I have renamed the
intermediate branch name to xen.git#smoke. There are also bugfixes,
commit message updates, and so on, following review, and one
additional early patch early on ("SQL `TRUE'").
a 01 docs: Document OSSTEST_RESOURCE_PRIORITY values in README.planner
a 02 Executive: cs-job-create: Check that OSSTEST_FLIGHT is not set
a 03 mg-list-all-branches: Suppress `maintjobs'
a 04 standalone: Do not blunder on after errors
a 05 standalone: Set very long SQLite3 busy timeout in Perl
a 06 cr-daily-branch: Honour AP_FETCH_PFX
* 07 memoise: New utility
a 08 standalone-generate-dump-flight-runvars: memoise ap-fetch
+ 09 standalone mode: Fix two SQL `TRUE's
a 10 mfi-common: Use job_create_build for build-*-prev
a 11 ap-fetch-version*: Unwrap xen-unstable lines
a 12 ap-push: Use refs/heads/ for destinations
a 13 cr-ensure-disk-space: Honour -D
a 14 cr-ensure-disk-space: Look at referring flights
a 15 cr-ensure-disk-space: Make main loop body into a subroutine
a 16 cr-ensure-disk-space: Take the flights db lock
-a 17 cs-job-create: Permit creation of `synth' runvars
* 18 mg-show-flight-runvars: Decorate synth runvar names with ~
a 19 standalone-generate-dump-flight-runvars: Show synth runvars
-a 20 ts-host-alloc-Executive: Honour various hostalloc_* runvars
+ 21 sg-check-tested: New --pass-job= option
+ 22 cs-adjust-flight: Provide `jobs-list' operation
+ 23 cs-adjust-flight: Break out job removal machinery
+ 24 cs-adjust-flight: Provide `jobs-del' operation
+ 25 New utility mg-adjust-flight-makexrefs
a 26 make-flight: Contemplate varying architecture for Debian HVM
a 27 make-flight: Run job_create_test_filter_callback on true job name
a 28 make-flight: mfi-common: Honour $global_runvars
* 29 make-flight: Provide xen-unstable-smoke branch
+ 30 cr-daily-branch: Use mg-adjust-flight to have smoke tests reuse builds
a 31 cri-common: Support xen-unstable-smoke
*a 32 ap-*: Be able to fetch and push xen.git#smoke
a 33 crontab: Enable xen-unstable-smoke branch every 3h at <1mod3>:51 UTC
a = acked
* = modified in series v2
+ = new patch in series v2
- = commit message (only) modified
One patch was dropped:
make-flight: Allow separate specification of pre-built Xen vs others
Below are three sets of verification and debugging output. Firstly
the difference (due to the post-memoisation changes) in the output of:
OSSTEST_CONFIG=standalone-config-example \
./standalone-generate-dump-flight-runvars
Secondly, the interesting part of the debug output from
AP_FETCH_PFX='./memoise tmp/apmemo' \
DAILY_BRANCH_POSTMAKE_HOOK='exit 0' \
OSSTEST_USE_HEAD=y \
BRANCHES_ALWAYS=xen-unstable-smoke \
OSSTEST_NO_BASELINE=y \
./cr-daily-branch xen-unstable-smoke
against the Cambridge instance.
Thirdly, ./mg-show-flight-runvars -a on the resulting flight, 37963.
Ian.
--- ../play-testing.git/before 2015-09-17 18:16:34.946474967 +0100
+++ after 2015-09-17 18:16:23.758206614 +0100
@@ -23100,16 +23100,16 @@
xen-unstable build-armhf-xsm revision_seabios
xen-unstable build-i386 revision_seabios
xen-unstable build-i386-xsm revision_seabios
-xen-unstable build-amd64 revision_xen 4600d7560425f89b32cd90ecf6084bae9293dfab
+xen-unstable build-amd64 revision_xen 340ade2f0ef692efce01a708ad98629af985f978
xen-unstable build-amd64-prev revision_xen 70d63e48077f8fee8eda6d8d95eeda52a34d9077
-xen-unstable build-amd64-rumpuserxen revision_xen 4600d7560425f89b32cd90ecf6084bae9293dfab
-xen-unstable build-amd64-xsm revision_xen 4600d7560425f89b32cd90ecf6084bae9293dfab
-xen-unstable build-armhf revision_xen 4600d7560425f89b32cd90ecf6084bae9293dfab
-xen-unstable build-armhf-xsm revision_xen 4600d7560425f89b32cd90ecf6084bae9293dfab
-xen-unstable build-i386 revision_xen 4600d7560425f89b32cd90ecf6084bae9293dfab
+xen-unstable build-amd64-rumpuserxen revision_xen 340ade2f0ef692efce01a708ad98629af985f978
+xen-unstable build-amd64-xsm revision_xen 340ade2f0ef692efce01a708ad98629af985f978
+xen-unstable build-armhf revision_xen 340ade2f0ef692efce01a708ad98629af985f978
+xen-unstable build-armhf-xsm revision_xen 340ade2f0ef692efce01a708ad98629af985f978
+xen-unstable build-i386 revision_xen 340ade2f0ef692efce01a708ad98629af985f978
xen-unstable build-i386-prev revision_xen 70d63e48077f8fee8eda6d8d95eeda52a34d9077
-xen-unstable build-i386-rumpuserxen revision_xen 4600d7560425f89b32cd90ecf6084bae9293dfab
-xen-unstable build-i386-xsm revision_xen 4600d7560425f89b32cd90ecf6084bae9293dfab
+xen-unstable build-i386-rumpuserxen revision_xen 340ade2f0ef692efce01a708ad98629af985f978
+xen-unstable build-i386-xsm revision_xen 340ade2f0ef692efce01a708ad98629af985f978
xen-unstable test-amd64-amd64-rumpuserxen-amd64 rump_builtimage rumpuserxen:/usr/local/lib/xen/rump-kernel/rump-kernel
xen-unstable test-amd64-i386-rumpuserxen-i386 rump_builtimage rumpuserxen:/usr/local/lib/xen/rump-kernel/rump-kernel
xen-unstable test-amd64-amd64-rumpuserxen-amd64 rump_cmdline 3
@@ -23365,3 +23365,109 @@
xen-unstable test-amd64-i386-rumpuserxen-i386 xenstorels_builtimage :/usr/local/bin/xenstore
xen-unstable test-amd64-amd64-rumpuserxen-amd64 xenstorels_cmdline ls -fp device
xen-unstable test-amd64-i386-rumpuserxen-i386 xenstorels_cmdline ls -fp device
+xen-unstable-smoke test-amd64-amd64-libvirt all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test,hvm
+xen-unstable-smoke test-armhf-armhf-xl all_hostflags arch-armhf,arch-xen-armhf,suite-wheezy,purpose-test
+xen-unstable-smoke build-amd64 arch amd64
+xen-unstable-smoke build-amd64-libvirt arch amd64
+xen-unstable-smoke build-amd64-pvops arch amd64
+xen-unstable-smoke build-armhf arch armhf
+xen-unstable-smoke build-armhf-pvops arch armhf
+xen-unstable-smoke test-amd64-amd64-libvirt arch amd64
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 arch amd64
+xen-unstable-smoke test-armhf-armhf-xl arch armhf
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 bios seabios
+xen-unstable-smoke build-amd64 build_lvextend_max 50
+xen-unstable-smoke build-amd64-libvirt build_lvextend_max 50
+xen-unstable-smoke build-amd64-pvops build_lvextend_max 50
+xen-unstable-smoke build-armhf build_lvextend_max 50
+xen-unstable-smoke build-armhf-pvops build_lvextend_max 50
+xen-unstable-smoke build-amd64-libvirt buildjob build-amd64
+xen-unstable-smoke test-amd64-amd64-libvirt buildjob build-amd64
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 buildjob build-amd64
+xen-unstable-smoke test-armhf-armhf-xl buildjob build-armhf
+xen-unstable-smoke test-amd64-amd64-libvirt debian_arch amd64
+xen-unstable-smoke test-armhf-armhf-xl debian_arch armhf
+xen-unstable-smoke test-amd64-amd64-libvirt debian_kernkind pvops
+xen-unstable-smoke test-armhf-armhf-xl debian_kernkind pvops
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 debianhvm_image debian-7.2.0-i386-CD-1.iso
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 device_model_version qemu-xen
+xen-unstable-smoke build-amd64 enable_ovmf true
+xen-unstable-smoke build-armhf enable_ovmf true
+xen-unstable-smoke build-amd64 enable_xend false
+xen-unstable-smoke build-armhf enable_xend false
+xen-unstable-smoke build-amd64 enable_xsm false
+xen-unstable-smoke build-armhf enable_xsm false
+xen-unstable-smoke test-amd64-amd64-libvirt enable_xsm false
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 enable_xsm false
+xen-unstable-smoke test-armhf-armhf-xl enable_xsm false
+xen-unstable-smoke build-amd64 host_hostflags share-build-wheezy-amd64,arch-amd64,suite-wheezy,purpose-build
+xen-unstable-smoke build-amd64-libvirt host_hostflags share-build-wheezy-amd64,arch-amd64,suite-wheezy,purpose-build
+xen-unstable-smoke build-amd64-pvops host_hostflags share-build-wheezy-amd64,arch-amd64,suite-wheezy,purpose-build
+xen-unstable-smoke build-armhf host_hostflags share-build-wheezy-armhf,arch-armhf,suite-wheezy,purpose-build
+xen-unstable-smoke build-armhf-pvops host_hostflags share-build-wheezy-armhf,arch-armhf,suite-wheezy,purpose-build
+xen-unstable-smoke build-armhf-pvops kconfig_override_y CONFIG_EXT4_FS
+xen-unstable-smoke build-amd64-pvops kconfighow xen-enable-xen-config
+xen-unstable-smoke build-armhf-pvops kconfighow xen-enable-xen-config
+xen-unstable-smoke test-amd64-amd64-libvirt kernbuildjob build-amd64-pvops
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 kernbuildjob build-amd64-pvops
+xen-unstable-smoke test-armhf-armhf-xl kernbuildjob build-armhf-pvops
+xen-unstable-smoke test-amd64-amd64-libvirt kernkind pvops
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 kernkind pvops
+xen-unstable-smoke test-armhf-armhf-xl kernkind pvops
+xen-unstable-smoke test-amd64-amd64-libvirt libvirtbuildjob build-amd64-libvirt
+xen-unstable-smoke build-amd64-libvirt revision_libvirt 17c4d2a17f9d8b50d6f6ddecb7a0bdb8b5ff0139
+xen-unstable-smoke build-amd64-pvops revision_linux 9b8b905951bde404f20a7bd4b37a5134f3484569
+xen-unstable-smoke build-armhf-pvops revision_linux 64972ceb0b0cafc91a09764bc731e1b7f0503b5c
+xen-unstable-smoke build-amd64-pvops revision_linuxfirmware c530a75c1e6a472b0eb9558310b518f0dfcd8860
+xen-unstable-smoke build-armhf-pvops revision_linuxfirmware c530a75c1e6a472b0eb9558310b518f0dfcd8860
+xen-unstable-smoke build-amd64 revision_ovmf
+xen-unstable-smoke build-armhf revision_ovmf
+xen-unstable-smoke build-amd64 revision_qemu
+xen-unstable-smoke build-armhf revision_qemu
+xen-unstable-smoke build-amd64 revision_qemuu b05befcbea71a979509ce04f02929969a790c923
+xen-unstable-smoke build-armhf revision_qemuu b05befcbea71a979509ce04f02929969a790c923
+xen-unstable-smoke build-amd64 revision_seabios
+xen-unstable-smoke build-armhf revision_seabios
+xen-unstable-smoke build-amd64 revision_xen a7b39c8bd6cba3fe1c8012987b9e28bdbac7e92d
+xen-unstable-smoke build-armhf revision_xen a7b39c8bd6cba3fe1c8012987b9e28bdbac7e92d
+xen-unstable-smoke test-amd64-amd64-libvirt toolstack libvirt
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 toolstack xl
+xen-unstable-smoke test-armhf-armhf-xl toolstack xl
+xen-unstable-smoke build-amd64-libvirt tree_libvirt git://xenbits.xen.org/libvirt.git
+xen-unstable-smoke build-amd64-pvops tree_linux git://xenbits.xen.org/linux-pvops.git
+xen-unstable-smoke build-armhf-pvops tree_linux git://xenbits.xen.org/linux-pvops.git
+xen-unstable-smoke build-amd64-pvops tree_linuxfirmware git://xenbits.xen.org/osstest/linux-firmware.git
+xen-unstable-smoke build-armhf-pvops tree_linuxfirmware git://xenbits.xen.org/osstest/linux-firmware.git
+xen-unstable-smoke build-amd64 tree_ovmf
+xen-unstable-smoke build-armhf tree_ovmf
+xen-unstable-smoke build-amd64 tree_qemu git://xenbits.xen.org/staging/qemu-xen-unstable.git
+xen-unstable-smoke build-armhf tree_qemu git://xenbits.xen.org/staging/qemu-xen-unstable.git
+xen-unstable-smoke build-amd64 tree_qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git
+xen-unstable-smoke build-armhf tree_qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git
+xen-unstable-smoke build-amd64 tree_seabios
+xen-unstable-smoke build-armhf tree_seabios
+xen-unstable-smoke build-amd64 tree_xen git://xenbits.xen.org/xen.git
+xen-unstable-smoke build-amd64-libvirt tree_xen git://xenbits.xen.org/xen.git
+xen-unstable-smoke build-armhf tree_xen git://xenbits.xen.org/xen.git
+xen-unstable-smoke build-amd64-pvops treevcs_linux git
+xen-unstable-smoke build-armhf-pvops treevcs_linux git
+xen-unstable-smoke test-amd64-amd64-libvirt xenbuildjob build-amd64
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 xenbuildjob build-amd64
+xen-unstable-smoke test-armhf-armhf-xl xenbuildjob build-armhf
+xen-unstable-smoke build-amd64 hostalloc_bonus_previousfail~ 0
+xen-unstable-smoke build-amd64-libvirt hostalloc_bonus_previousfail~ 0
+xen-unstable-smoke build-amd64-pvops hostalloc_bonus_previousfail~ 0
+xen-unstable-smoke build-armhf hostalloc_bonus_previousfail~ 0
+xen-unstable-smoke build-armhf-pvops hostalloc_bonus_previousfail~ 0
+xen-unstable-smoke test-amd64-amd64-libvirt hostalloc_bonus_previousfail~ 0
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 hostalloc_bonus_previousfail~ 0
+xen-unstable-smoke test-armhf-armhf-xl hostalloc_bonus_previousfail~ 0
+xen-unstable-smoke build-amd64 hostalloc_maxbonus_variation~ 0
+xen-unstable-smoke build-amd64-libvirt hostalloc_maxbonus_variation~ 0
+xen-unstable-smoke build-amd64-pvops hostalloc_maxbonus_variation~ 0
+xen-unstable-smoke build-armhf hostalloc_maxbonus_variation~ 0
+xen-unstable-smoke build-armhf-pvops hostalloc_maxbonus_variation~ 0
+xen-unstable-smoke test-amd64-amd64-libvirt hostalloc_maxbonus_variation~ 0
+xen-unstable-smoke test-amd64-amd64-xl-qemuu-debianhvm-i386 hostalloc_maxbonus_variation~ 0
+xen-unstable-smoke test-armhf-armhf-xl hostalloc_maxbonus_variation~ 0
...
++ ./make-flight xen-unstable-smoke xen-unstable play
+ flight=37963
+ case $branch in
+ ./mg-adjust-flight-makexrefs -v 37963 '!build-amd64 !build-armhf build-*' --debug --branch=xen-unstable --blessings=real
==========
SELECT *
FROM flights
WHERE
EXISTS
(SELECT 1
FROM jobs j
WHERE j.job = ?
AND j.flight = flights.flight
AND j.status = 'pass')
AND
branch = ?
AND
(blessing=?)
ORDER BY flight DESC
LIMIT 1
----------
build-amd64-libvirt | xen-unstable | real
==========
==========YES
37963.test-amd64-amd64-libvirt libvirtbuildjob := `37938.build-amd64-libvirt' (exactly matches `build-amd64-libvirt')
37963.build-amd64-libvirt job deleted
==========
SELECT *
FROM flights
WHERE
EXISTS
(SELECT 1
FROM jobs j
WHERE j.job = ?
AND j.flight = flights.flight
AND j.status = 'pass')
AND
branch = ?
AND
(blessing=?)
ORDER BY flight DESC
LIMIT 1
----------
build-amd64-pvops | xen-unstable | real
==========
==========YES
37963.test-amd64-amd64-libvirt kernbuildjob := `37938.build-amd64-pvops' (exactly matches `build-amd64-pvops')
37963.test-amd64-amd64-xl-qemuu-debianhvm-i386 kernbuildjob := `37938.build-amd64-pvops' (exactly matches `build-amd64-pvops')
37963.build-amd64-pvops job deleted
==========
SELECT *
FROM flights
WHERE
EXISTS
(SELECT 1
FROM jobs j
WHERE j.job = ?
AND j.flight = flights.flight
AND j.status = 'pass')
AND
branch = ?
AND
(blessing=?)
ORDER BY flight DESC
LIMIT 1
----------
build-armhf-pvops | xen-unstable | real
==========
==========YES
37963.test-armhf-armhf-xl kernbuildjob := `37938.build-armhf-pvops' (exactly matches `build-armhf-pvops')
37963.build-armhf-pvops job deleted
+ exit 0
test-amd64-amd64-libvirt all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test
test-amd64-amd64-xl-qemuu-debianhvm-i386 all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test,hvm
test-armhf-armhf-xl all_hostflags arch-armhf,arch-xen-armhf,suite-wheezy,purpose-test
build-amd64 arch amd64
build-armhf arch armhf
test-amd64-amd64-libvirt arch amd64
test-amd64-amd64-xl-qemuu-debianhvm-i386 arch amd64
test-armhf-armhf-xl arch armhf
test-amd64-amd64-xl-qemuu-debianhvm-i386 bios seabios
test-amd64-amd64-libvirt buildjob build-amd64
test-amd64-amd64-xl-qemuu-debianhvm-i386 buildjob build-amd64
test-armhf-armhf-xl buildjob build-armhf
test-amd64-amd64-libvirt debian_arch amd64
test-armhf-armhf-xl debian_arch armhf
test-amd64-amd64-xl-qemuu-debianhvm-i386 debianhvm_image debian-7.2.0-i386-CD-1.iso
test-amd64-amd64-libvirt debian_kernkind pvops
test-armhf-armhf-xl debian_kernkind pvops
test-amd64-amd64-xl-qemuu-debianhvm-i386 device_model_version qemu-xen
build-amd64 enable_ovmf true
build-armhf enable_ovmf true
build-amd64 enable_xend false
build-armhf enable_xend false
build-amd64 enable_xsm false
build-armhf enable_xsm false
test-amd64-amd64-libvirt enable_xsm false
test-amd64-amd64-xl-qemuu-debianhvm-i386 enable_xsm false
test-armhf-armhf-xl enable_xsm false
build-amd64 host_hostflags share-build-wheezy-amd64,arch-amd64,suite-wheezy,purpose-build
build-armhf host_hostflags share-build-wheezy-armhf,arch-armhf,suite-wheezy,purpose-build
test-amd64-amd64-libvirt kernbuildjob 37938.build-amd64-pvops
test-amd64-amd64-xl-qemuu-debianhvm-i386 kernbuildjob 37938.build-amd64-pvops
test-armhf-armhf-xl kernbuildjob 37938.build-armhf-pvops
test-amd64-amd64-libvirt kernkind pvops
test-amd64-amd64-xl-qemuu-debianhvm-i386 kernkind pvops
test-armhf-armhf-xl kernkind pvops
test-amd64-amd64-libvirt libvirtbuildjob 37938.build-amd64-libvirt
build-amd64 revision_ovmf
build-armhf revision_ovmf
build-amd64 revision_qemu
build-armhf revision_qemu
build-amd64 revision_qemuu b05befcbea71a979509ce04f02929969a790c923
build-armhf revision_qemuu b05befcbea71a979509ce04f02929969a790c923
build-amd64 revision_seabios
build-armhf revision_seabios
build-amd64 revision_xen a7b39c8bd6cba3fe1c8012987b9e28bdbac7e92d
build-armhf revision_xen a7b39c8bd6cba3fe1c8012987b9e28bdbac7e92d
test-amd64-amd64-libvirt toolstack libvirt
test-amd64-amd64-xl-qemuu-debianhvm-i386 toolstack xl
test-armhf-armhf-xl toolstack xl
build-amd64 tree_ovmf
build-armhf tree_ovmf
build-amd64 tree_qemu git://xenbits.xen.org/staging/qemu-xen-unstable.git
build-armhf tree_qemu git://xenbits.xen.org/staging/qemu-xen-unstable.git
build-amd64 tree_qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git
build-armhf tree_qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git
build-amd64 tree_seabios
build-armhf tree_seabios
build-amd64 tree_xen git://xenbits.xen.org/xen.git
build-armhf tree_xen git://xenbits.xen.org/xen.git
test-amd64-amd64-libvirt xenbuildjob build-amd64
test-amd64-amd64-xl-qemuu-debianhvm-i386 xenbuildjob build-amd64
test-armhf-armhf-xl xenbuildjob build-armhf
build-amd64 hostalloc_bonus_previousfail~ 0
build-armhf hostalloc_bonus_previousfail~ 0
test-amd64-amd64-libvirt hostalloc_bonus_previousfail~ 0
test-amd64-amd64-xl-qemuu-debianhvm-i386 hostalloc_bonus_previousfail~ 0
test-armhf-armhf-xl hostalloc_bonus_previousfail~ 0
build-amd64 hostalloc_maxbonus_variation~ 0
build-armhf hostalloc_maxbonus_variation~ 0
test-amd64-amd64-libvirt hostalloc_maxbonus_variation~ 0
test-amd64-amd64-xl-qemuu-debianhvm-i386 hostalloc_maxbonus_variation~ 0
test-armhf-armhf-xl hostalloc_maxbonus_variation~ 0
--
^ permalink raw reply [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 01/33] docs: Document OSSTEST_RESOURCE_PRIORITY values in README.planner
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 02/33] Executive: cs-job-create: Check that OSSTEST_FLIGHT is not set Ian Jackson
` (31 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
README.planner | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/README.planner b/README.planner
index 21b3415..dfa623e 100644
--- a/README.planner
+++ b/README.planner
@@ -84,6 +84,13 @@ no resources actually get allocated), so that there is a report for
the administrator showing an idea of what the system thinks may happen
in the more distant future.
+Values for OSSTEST_RESOURCE_PRIORITY:
+ mg-allocate -1000000
+ mg-blockage -2000000
+ default Executive.pm with controlling terminal -10
+ mg-execute-flight -8
+ default 0
+
ms-ownerdaemon and `ownd' tasks
-------------------------------
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 02/33] Executive: cs-job-create: Check that OSSTEST_FLIGHT is not set
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 01/33] docs: Document OSSTEST_RESOURCE_PRIORITY values in README.planner Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 03/33] mg-list-all-branches: Suppress `maintjobs' Ian Jackson
` (30 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
If OSSTEST_FLIGHT is set on entry to JobDB::Executive::flight_create,
fail. This obviously represents some kind of mistake.
One effect is that standalone-generate-dump-flight-runvars won't fill
an Executive database with test flights.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
Osstest/JobDB/Executive.pm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index cc52f57..6ba3d37 100644
--- a/Osstest/JobDB/Executive.pm
+++ b/Osstest/JobDB/Executive.pm
@@ -89,6 +89,8 @@ END
sub flight_create ($$$) { #method
my ($jd,$intended,$branch) = @_;
+ die "OSSTEST_FLIGHT set on entry to JobDB::Executive::flight_create\n"
+ if $ENV{'OSSTEST_FLIGHT'};
$dbh_tests->do(<<END, {}, $branch, $intended);
INSERT INTO flights
(flight, started, blessing, branch, intended)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 03/33] mg-list-all-branches: Suppress `maintjobs'
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 01/33] docs: Document OSSTEST_RESOURCE_PRIORITY values in README.planner Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 02/33] Executive: cs-job-create: Check that OSSTEST_FLIGHT is not set Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 04/33] standalone: Do not blunder on after errors Ian Jackson
` (29 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
This is not a real branch; it's a cron working directory, only.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
mg-list-all-branches | 2 ++
1 file changed, 2 insertions(+)
diff --git a/mg-list-all-branches b/mg-list-all-branches
index 1549f81..87703c7 100755
--- a/mg-list-all-branches
+++ b/mg-list-all-branches
@@ -16,4 +16,6 @@ foreach my $f (qw(cr-for-branches crontab)) {
close C or die $!;
}
+delete $branches{maintjobs};
+
print $_,"\n" or die $! foreach sort { versioncmp($a, $b) } keys %branches;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 04/33] standalone: Do not blunder on after errors
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (2 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 03/33] mg-list-all-branches: Suppress `maintjobs' Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 05/33] standalone: Set very long SQLite3 busy timeout in Perl Ian Jackson
` (28 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
./standalone's with_logging function would _log_ errors, but it
wouldn't exit immediately. As a result, the script would blunder on.
Normally it wouldn't do very much more since most of the with_logging
calls are the last thing it does - but the exit status would be wrong
(0, from echo).
As a result, for example, standalone-generate-dump-flight-runvars
would never properly report make-flight failures.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
standalone | 1 +
1 file changed, 1 insertion(+)
diff --git a/standalone b/standalone
index 873616a..60b6666 100755
--- a/standalone
+++ b/standalone
@@ -194,6 +194,7 @@ with_logging() {
rc=${PIPESTATUS[0]}
if [ $rc -ne 0 ] ; then
echo "FAILED rc=${rc}" >&2
+ exit $rc
fi
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 05/33] standalone: Set very long SQLite3 busy timeout in Perl
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (3 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 04/33] standalone: Do not blunder on after errors Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 06/33] cr-daily-branch: Honour AP_FETCH_PFX Ian Jackson
` (27 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Without this, big standalone-generate-dump-flight-runvars jobs may
trying to serialise so much work that SQLite3 times out. And we are
about to introduce an optimisation which makes this much more likely.
In standalone mode we probably don't care much about this timeout at
all. (It might even be that the user is using sqlite(3) and has
effectively locked the database interactively for an extended period.)
We would prefer to rely on the user to stop anything that seems to
have become stuck. So set the timeout to 10ks.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
Osstest/JobDB/Standalone.pm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Osstest/JobDB/Standalone.pm b/Osstest/JobDB/Standalone.pm
index 45ec9ca..431ba5a 100644
--- a/Osstest/JobDB/Standalone.pm
+++ b/Osstest/JobDB/Standalone.pm
@@ -52,6 +52,9 @@ sub open ($) {
ShowErrorStatement => 1,
})
or die "could not open standalone db $dbi";
+
+ $dbh->sqlite_busy_timeout(10E6); # 10ks
+
return $dbh;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 06/33] cr-daily-branch: Honour AP_FETCH_PFX
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (4 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 05/33] standalone: Set very long SQLite3 busy timeout in Perl Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 07/33] memoise: New utility Ian Jackson
` (26 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
This environment variable is prefixed to all cr-daily-branch's command
lines involving ap-fetch. We are going to use this for memoisation.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
cr-daily-branch | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/cr-daily-branch b/cr-daily-branch
index ade515d..9500bdc 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -51,12 +51,12 @@ determine_version () {
if [ "x$FORCE_REVISION" != x ]; then
tversion="$FORCE_REVISION"
else
- tversion=`./ap-fetch-version "$tbranch"`
+ tversion=`$AP_FETCH_PFX ./ap-fetch-version "$tbranch"`
fi
determine_tree "$treevarwhich" "" _${treevarwhich}
determine_tree "$treevarwhich" "" _${treevarwhich}_THIS
else
- tversion=`./ap-fetch-version-baseline "$tbranch"`
+ tversion=`$AP_FETCH_PFX ./ap-fetch-version-baseline "$tbranch"`
determine_tree "$treevarwhich" BASE_ _${treevarwhich}
determine_tree "$treevarwhich" BASE_ _${treevarwhich}_THIS
fi
@@ -98,7 +98,7 @@ if [ "x$OLD_REVISION" = x ]; then
# last test will have tested the previous upstream baseline
OLD_REVISION=`check_tested --print-revision=$tree`
else
- OLD_REVISION="`./ap-fetch-version-old $branch`"
+ OLD_REVISION="`$AP_FETCH_PFX ./ap-fetch-version-old $branch`"
fi
;;
esac
@@ -131,7 +131,8 @@ if [ "x$REVISION_XEN" = x ]; then
export REVISION_XEN
fi
if [ "x$REVISION_PREVXEN" = x -a "x$prevxenbranch" != "x" ]; then
- REVISION_PREVXEN="`./ap-fetch-version-baseline $prevxenbranch`"
+ REVISION_PREVXEN="`\
+ $AP_FETCH_PFX ./ap-fetch-version-baseline $prevxenbranch`"
export REVISION_PREVXEN
fi
if [ "x$REVISION_QEMU_UPSTREAM" = x ]; then
@@ -252,7 +253,8 @@ ovmf)
esac
if [ "x$OLD_REVISION" = xdetermine-late ]; then
- OLD_REVISION="`./ap-fetch-version-baseline-late $branch $NEW_REVISION`"
+ OLD_REVISION="`\
+ $AP_FETCH_PFX ./ap-fetch-version-baseline-late $branch $NEW_REVISION`"
fi
case $branch in
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 07/33] memoise: New utility
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (5 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 06/33] cr-daily-branch: Honour AP_FETCH_PFX Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-18 9:25 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 08/33] standalone-generate-dump-flight-runvars: memoise ap-fetch Ian Jackson
` (25 subsequent siblings)
32 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Give this a GPLv2+ licence so that we can move it into some other
FLOSS package later.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: Do not use FSF street address in copyright notice.
Ship a copy of GPL-3.
---
GPL-3 | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
memoise | 56 ++++++
2 files changed, 730 insertions(+)
create mode 100644 GPL-3
create mode 100755 memoise
diff --git a/GPL-3 b/GPL-3
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/GPL-3
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/memoise b/memoise
new file mode 100755
index 0000000..73f15e6
--- /dev/null
+++ b/memoise
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# memoise - a command line output memoisation tool
+#
+# usage:
+# memoise datadir cmd arg arg ...
+#
+# will create datadir if necessary; delete datadir when you're done
+#
+# Copyright 2015 Citrix Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program (eg in the file GPL-3). If not, see
+# <http://www.gnu.org/licenses/>.
+#
+# NB that the rest of osstest is AGPLv3+, so when this file is
+# distributed together with osstest, the AGPLv3 applies.
+
+set -e
+
+case "$#.$1" in
+[01].) echo >&2 "memoise: too few args"; exit 127 ;;
+*.-) echo >&2 "memoise: unknown option $1"; exit 127 ;;
+esac
+
+datadir=$1; shift
+
+mkdir -p -- "$datadir"
+
+id=`for arg in "$@"; do printf '%s\0' "$arg"; done | sha256sum`
+id=${id% -}
+
+f="$datadir/$id"
+
+if ! [ -f "$f.o" ]; then
+ with-lock-ex -w "$f.l" sh -ec '
+ f=$1; shift
+ if [ -f "$f.o" ]; then exit 0; fi
+ exec </dev/null >"$f.t"
+ "$@"
+ mv -- "$f.t" "$f.o"
+ rm "$f.l"
+ ' x "$f" "$@"
+fi
+
+cat -- "$f.o"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 08/33] standalone-generate-dump-flight-runvars: memoise ap-fetch
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (6 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 07/33] memoise: New utility Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 09/33] standalone mode: Fix two SQL `TRUE's Ian Jackson
` (24 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
This makes it _much_ faster.
Also you can say AP_FETCH_MEMO_KEEP=1 to make it reuse old
information, which is useful for making comparisons.
For a further speed improvement, one can use `eatmydata'. This is not
the default because it risks corruption of `standalone.db' which is
used for other purposes too. Add a comment about possibly improving
this.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
standalone-generate-dump-flight-runvars | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/standalone-generate-dump-flight-runvars b/standalone-generate-dump-flight-runvars
index 4405720..ed94792 100755
--- a/standalone-generate-dump-flight-runvars
+++ b/standalone-generate-dump-flight-runvars
@@ -36,6 +36,17 @@ if [ $# = 0 ]; then
set `./mg-list-all-branches`
fi
+if [ "x$AP_FETCH_MEMO_KEEP" = x ]; then
+ rm -rf tmp/apmemo
+ mkdir tmp/apmemo
+fi
+export AP_FETCH_PFX='./memoise tmp/apmemo'
+
+# In the future it might be nice for this script to arrange to use a
+# separate standalone.db, in tmp/ probably, for each different branch.
+# That would avoid a lot of needless write contention over the single
+# db, and make it possible to use `eatmydata' if it is installed.
+
perbranch () {
log=tmp/make-flight.$branch.log
flight=check_${branch//[-._]/_}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 09/33] standalone mode: Fix two SQL `TRUE's
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (7 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 08/33] standalone-generate-dump-flight-runvars: memoise ap-fetch Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-18 9:26 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 10/33] mfi-common: Use job_create_build for build-*-prev Ian Jackson
` (23 subsequent siblings)
32 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
SQL has no portable boolean true literal (really). SQLite3 does not
understand `TRUE'. Use `1=1' instead.
This means that mg-show-flight-runvars -a will work in standalone
mode.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: New patch
---
mg-show-flight-runvars | 2 +-
sg-report-flight | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mg-show-flight-runvars b/mg-show-flight-runvars
index 62d5cba..e33a3f0 100755
--- a/mg-show-flight-runvars
+++ b/mg-show-flight-runvars
@@ -33,7 +33,7 @@ for (;;) {
$_ = shift @ARGV;
last if m/^\-\-?$/;
if (m/^-a$/) {
- $synthcond = 'TRUE';
+ $synthcond = '(1=1)';
} else {
die "$_ ?";
}
diff --git a/sg-report-flight b/sg-report-flight
index a88379a..ef3fd6b 100755
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -176,7 +176,7 @@ END
}
my @flightsq_params;
- my $flightsq_jobcond='TRUE';
+ my $flightsq_jobcond='(1=1)';
if (defined $job) {
push @flightsq_params, $job;
$flightsq_jobcond = <<END;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 10/33] mfi-common: Use job_create_build for build-*-prev
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (8 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 09/33] standalone mode: Fix two SQL `TRUE's Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 11/33] ap-fetch-version*: Unwrap xen-unstable lines Ian Jackson
` (22 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
This causes it to call job_create_build_filter_callback but has no
ultimate functional change.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
mfi-common | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mfi-common b/mfi-common
index 991baf5..aaaeac9 100644
--- a/mfi-common
+++ b/mfi-common
@@ -216,7 +216,7 @@ create_build_jobs () {
# only pass tree_xen and revision_xen here and therefore
# pickup the versions implicitly selected by the
# $REVISION_PREVXEN.
- ./cs-job-create $flight build-$arch-prev build \
+ job_create_build build-$arch-prev build \
arch=$arch enable_xend=false enable_ovmf=$enable_ovmf \
enable_xsm=false \
tree_xen=$TREE_XEN \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 11/33] ap-fetch-version*: Unwrap xen-unstable lines
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (9 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 10/33] mfi-common: Use job_create_build for build-*-prev Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 12/33] ap-push: Use refs/heads/ for destinations Ian Jackson
` (21 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Whitespace and \ change only. Makes the next patch a bit clearer.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
ap-fetch-version | 3 +--
ap-fetch-version-old | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ap-fetch-version b/ap-fetch-version
index 8b41acf..488ea55 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -40,8 +40,7 @@ xen-3.*)
' x
;;
xen-unstable)
- repo_tree_rev_fetch_git xen \
- $TREE_XEN staging $LOCALREV_XEN
+ repo_tree_rev_fetch_git xen $TREE_XEN staging $LOCALREV_XEN
;;
xen-4.*-testing)
branchcore=${branch#xen-}
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 0b4739b..7b918e3 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -48,8 +48,7 @@ xen-3.*)
'
;;
xen-unstable)
- repo_tree_rev_fetch_git xen \
- $TREE_XEN master $LOCALREV_XEN
+ repo_tree_rev_fetch_git xen $TREE_XEN master $LOCALREV_XEN
;;
xen-4.*-testing)
branchcore=${branch#xen-}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 12/33] ap-push: Use refs/heads/ for destinations
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (10 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 11/33] ap-fetch-version*: Unwrap xen-unstable lines Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 13/33] cr-ensure-disk-space: Honour -D Ian Jackson
` (20 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
When the destination is a branch, specify refs/heads/ explicitly.
This makes ap-push work even if the ref does not yet exist on the
destination.
There is no functional change for an existing installation pushing to
an existing branch. But for a hypothetical new installation, this
would be necessary.
And, more relevantly, when new "branches" are invented, the use of an
existing ap-push case as a template will generate a new case which
creates the branch as is necessary.
I leave the more complex osstest case alone. It's not clear to me
whether the destination ref not existing is an installation problem of
such severity that indeed ap-push should fail.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
ap-push | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ap-push b/ap-push
index 5967b42..1dd5b05 100755
--- a/ap-push
+++ b/ap-push
@@ -52,14 +52,14 @@ xen-3.*)
;;
xen-unstable)
cd $repos/xen
- git push $TREE_XEN $revision:master
+ git push $TREE_XEN $revision:refs/heads/master
;;
xen-*-testing)
cd $repos/xen
xenversion=$branch
xenversion=${branch%-testing}
xenversion=${xenversion#xen-}
- git push $TREE_XEN $revision:stable-$xenversion
+ git push $TREE_XEN $revision:refs/heads/stable-$xenversion
;;
qemu-mainline)
cd $repos/qemu-mainline
@@ -67,11 +67,11 @@ qemu-mainline)
;;
qemu-upstream-*)
cd $repos/$branch
- git push $TREE_QEMU_UPSTREAM $revision:master
+ git push $TREE_QEMU_UPSTREAM $revision:refs/heads/master
;;
linux-3.*)
cd $repos/linux
- git push $TREE_LINUX $revision:tested/$branch
+ git push $TREE_LINUX $revision:refs/heads/tested/$branch
;;
linux-2.6.39)
cd $repos/linux
@@ -83,11 +83,11 @@ linux-xen-*)
;;
libvirt)
cd $repos/libvirt
- git push $TREE_LIBVIRT $revision:xen-tested-master
+ git push $TREE_LIBVIRT $revision:refs/heads/xen-tested-master
;;
rumpuserxen)
cd $repos/rumpuserxen
- git push $TREE_RUMPUSERXEN $revision:xen-tested-master
+ git push $TREE_RUMPUSERXEN $revision:refs/heads/xen-tested-master
;;
seabios)
cd $repos/seabios
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 13/33] cr-ensure-disk-space: Honour -D
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (11 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 12/33] ap-push: Use refs/heads/ for destinations Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 14/33] cr-ensure-disk-space: Look at referring flights Ian Jackson
` (19 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Provide DEBUG and use db_prepare. For now that is the only debugging
output.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
cr-ensure-disk-space | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/cr-ensure-disk-space b/cr-ensure-disk-space
index 304f262..ced9777 100755
--- a/cr-ensure-disk-space
+++ b/cr-ensure-disk-space
@@ -27,11 +27,15 @@ use Fcntl qw(:flock);
our $dryrun= 0;
+open DEBUG, ">/dev/null" or die $!;
+
while (@ARGV && $ARGV[0] =~ m/^\-/) {
$_= shift @ARGV;
last if $_ eq '--';
if (m/^-n$/) {
$dryrun= 1;
+ } elsif (m/^-D$/) {
+ open DEBUG, ">&2" or die $!;
} else {
die "$_ ?";
}
@@ -50,7 +54,7 @@ flock LOCK, LOCK_EX or die $!;
$|=1;
-my $chkq= $dbh_tests->prepare("SELECT * FROM flights WHERE flight=?");
+my $chkq= db_prepare("SELECT * FROM flights WHERE flight=?");
our @flights;
for (;;) {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 14/33] cr-ensure-disk-space: Look at referring flights
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (12 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 13/33] cr-ensure-disk-space: Honour -D Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 15/33] cr-ensure-disk-space: Make main loop body into a subroutine Ian Jackson
` (18 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Previously the flight to delete was simply the one with the lowest
flight number. Now we sort flights not by their own flight number,
but by the highest flight number of any referencing flight.
This means that flights whose builds are being reused are kept as long
as the reusing flights.
This almost-entirely fixes a largely-theoretical race in the way
cs-bisection-step works (where the flight's logs and build outputs
might be deleted between the setup and execution of the referring
flight).
A smaller race still exists because the stash check in
cs-bisection-step occurs before the being-created flight is visible to
other db clients. We will have to fix this by taking the flights
lock.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
cr-ensure-disk-space | 43 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/cr-ensure-disk-space b/cr-ensure-disk-space
index ced9777..0314e7a 100755
--- a/cr-ensure-disk-space
+++ b/cr-ensure-disk-space
@@ -55,7 +55,17 @@ flock LOCK, LOCK_EX or die $!;
$|=1;
my $chkq= db_prepare("SELECT * FROM flights WHERE flight=?");
+
+my $refq= db_prepare(<<END);
+ SELECT flight, val
+ FROM runvars
+ WHERE name like '%job'
+ AND val like '%.%'
+ AND flight >= ?
+END
+
our @flights;
+our %latestref;
for (;;) {
open P, "-|", onloghost "df --block-size=1M -P $logdir" or die $!;
@@ -69,23 +79,46 @@ for (;;) {
last if $space >= logcfg('MinSpaceMby');
if (!@flights) {
+ %latestref = ();
open P, "-|", onloghost "ls -1 $logdir" or die $!;
+
+ my $minflight = undef;
while (<P>) {
next unless m/^(\d+)\n$/;
- push @flights, $1;
+ $latestref{$1} = $1;
+ $minflight //= $1;
+ $minflight = $1 if $1 < $minflight;
}
$!=$?=0; close P or die "ls: $? $!";
- @flights = sort { $b <=> $a } @flights;
+
+ print DEBUG "MINFLIGHT $minflight\n";
+
+ $refq->execute($minflight);
+ while (my $rr= $refq->fetchrow_hashref) {
+ my $testflight = $rr->{flight};
+ next unless $rr->{val} =~ m/^(\d+)\./;
+ my $buildflight = $1;
+ next unless exists $latestref{$buildflight};
+ if ($testflight > $latestref{$buildflight}) {
+ print DEBUG "REF $buildflight <- $testflight\n";
+ $latestref{$buildflight} = $testflight;
+ }
+ }
+
+ @flights =
+ sort { $latestref{$b} <=> $latestref{$a} }
+ keys %latestref;
printf "(%d flights) ", scalar @flights;
die unless @flights;
}
my $flight = pop @flights;
- printf "selected %s ", $flight;
+ my $latestref = $latestref{$flight};
+ printf "selected %s (latest ref %s) ", $flight, $latestref;
- $chkq->execute($flight);
+ $chkq->execute($latestref);
my $row= $chkq->fetchrow_hashref();
$chkq->finish();
- die $flight unless defined $row;
+ die "$flight $latestref" unless defined $row;
my $age= time - $row->{started};
printf "(age %dd) ", $age / 86400;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 15/33] cr-ensure-disk-space: Make main loop body into a subroutine
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (13 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 14/33] cr-ensure-disk-space: Look at referring flights Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 16/33] cr-ensure-disk-space: Take the flights db lock Ian Jackson
` (17 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
No functional change.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
cr-ensure-disk-space | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/cr-ensure-disk-space b/cr-ensure-disk-space
index 0314e7a..8c5a708 100755
--- a/cr-ensure-disk-space
+++ b/cr-ensure-disk-space
@@ -67,7 +67,7 @@ END
our @flights;
our %latestref;
-for (;;) {
+sub iteration_continue () {
open P, "-|", onloghost "df --block-size=1M -P $logdir" or die $!;
$_= <P>;
m/^filesystem/i or die "$_ ?";
@@ -76,7 +76,7 @@ for (;;) {
$!=0; $?=0; close P or die "$! $?";
my $space= $1;
printf "space: %8d, wanted: %8d ", $space, logcfg('MinSpaceMby');
- last if $space >= logcfg('MinSpaceMby');
+ return 0 if $space >= logcfg('MinSpaceMby');
if (!@flights) {
%latestref = ();
@@ -141,6 +141,13 @@ for (;;) {
END
printf "done.\n";
+
+ return 1;
+}
+
+for (;;) {
+ iteration_continue()
+ or last;
}
printf "ok.\n";
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 16/33] cr-ensure-disk-space: Take the flights db lock
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (14 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 15/33] cr-ensure-disk-space: Make main loop body into a subroutine Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 17/33] cs-job-create: Permit creation of `synth' runvars Ian Jackson
` (16 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
This eliminates the race with cs-bisection-step (and other
flight-construction tools which might reuse previous flights, provided
that they also do not pass previous flight numbers from hand to hand
with the db unlocked).
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
cr-ensure-disk-space | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/cr-ensure-disk-space b/cr-ensure-disk-space
index 8c5a708..138f3f4 100755
--- a/cr-ensure-disk-space
+++ b/cr-ensure-disk-space
@@ -145,10 +145,13 @@ END
return 1;
}
-for (;;) {
- iteration_continue()
- or last;
-}
+db_retry($dbh_tests,[qw(flights)], sub {
+ @flights = ();
+ for (;;) {
+ iteration_continue()
+ or last;
+ }
+});
printf "ok.\n";
exit 0;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 17/33] cs-job-create: Permit creation of `synth' runvars
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (15 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 16/33] cr-ensure-disk-space: Take the flights db lock Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 18/33] mg-show-flight-runvars: Decorate synth runvar names with ~ Ian Jackson
` (15 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
This will be useful for some hostalloc_* runvars which we are going to
introduce shortly.
This is going to be the way to set a runvar which is not copied by
cs-bisection-step or cs-adjust-flight. Using `synth' for this is
arguably slightly wrong but it does the right thing in all existing
cases. The alternative would be a schema change.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Defer some of the discussion to later commit messages.
---
cs-job-create | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/cs-job-create b/cs-job-create
index df2738c..9812bf2 100755
--- a/cs-job-create
+++ b/cs-job-create
@@ -2,6 +2,11 @@
#
# args:
# <flight> <job> <recipe> <runvar>=<value> ...
+#
+# If <runvar> ends in ~, the ~ is stripped and the runvar is marked
+# `synth'. (Normally runvars marked `synth' are defined during test
+# execution. They are not taken as part of the runvar set copied
+# when cloning flights, eg for bisection.)
# This is part of "osstest", an automated testing framework for Xen.
# Copyright (C) 2009-2013 Citrix Inc.
@@ -47,9 +52,9 @@ foreach my $rv (@runvars) {
$suppress{$1}= 1;
next;
}
- $rv =~ m/^([a-z][0-9a-z_]*)\=(.*)$/ or die "$rv ?";
- my ($name,$val) = ($1,$2);
- $runvars{$name}= $val;
+ $rv =~ m/^([a-z][0-9a-z_]*)(\~?)\=(.*)$/ or die "$rv ?";
+ my ($name,$synth,$val) = ($1,$2,$3);
+ $runvars{$name}= [$val,$synth];
}
foreach my $name (keys %suppress) {
@@ -61,9 +66,10 @@ db_retry($flight,'constructing', $dbh_tests,[qw(flights)], sub {
INSERT INTO jobs VALUES (?,'$job','$recipe','queued')
END
my $q= $dbh_tests->
- prepare("INSERT INTO runvars VALUES (?,'$job',?,?,'f')");
+ prepare("INSERT INTO runvars VALUES (?,'$job',?,?,?)");
foreach my $name (keys %runvars) {
- $q->execute($flight, $name, $runvars{$name});
+ $q->execute($flight, $name, $runvars{$name}[0],
+ $runvars{$name}[1] ? 't' : 'f');
$q->finish();
}
});
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 18/33] mg-show-flight-runvars: Decorate synth runvar names with ~
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (16 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 17/33] cs-job-create: Permit creation of `synth' runvars Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-18 9:27 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 19/33] standalone-generate-dump-flight-runvars: Show synth runvars Ian Jackson
` (14 subsequent siblings)
32 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Make mg-show-flight-runvars -a append ~ to the names of synth runvars.
(This is consistent with the new syntax in cs-job-create.)
We do this by editing $row[1] (and $colws[1]) so we can avoid
disturbing the general column format calculation and printing.
We switch to fetchrow_array rather than fetchrow_arrayref. This is
clearer and also avoids having to copy $row (because the value in the
DB $row from fetchrow_hashref would be readonly).
We have to check for $synth eq 'f' as well as $synth being boolean
false, because SQLite's typeless nature (or, to put it another way,
DBD::SQLite's failure to look at the schema) means that a boolean
field's value of 'f' or 't' is simply returned as a string to Perl.
But of course "f" is trueish in Perl.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: Use fetchrow_array instead.
Do not mistakenly drop the $synthcond assignment (!)
---
mg-show-flight-runvars | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/mg-show-flight-runvars b/mg-show-flight-runvars
index e33a3f0..c800110 100755
--- a/mg-show-flight-runvars
+++ b/mg-show-flight-runvars
@@ -26,6 +26,7 @@ use Osstest;
csreadconfig();
my $synthcond = '(NOT synth)';
+my $synthsufx = '';
for (;;) {
last unless @ARGV;
@@ -34,6 +35,7 @@ for (;;) {
last if m/^\-\-?$/;
if (m/^-a$/) {
$synthcond = '(1=1)';
+ $synthsufx = '~';
} else {
die "$_ ?";
}
@@ -52,10 +54,14 @@ my @colws = $dbh_tests->selectrow_array
("SELECT ".(join ',', map { "max(length($_))" } @cols)." $qfrom");
my $q = $dbh_tests->prepare
- ("SELECT ".(join ',', @cols)." $qfrom ORDER BY name, job");
+ ("SELECT synth, ".(join ',', @cols)." $qfrom ORDER BY synth, name, job");
$q->execute();
-while (my $row = $q->fetchrow_arrayref()) {
- printf "%-*s %-*s %-*s\n", map { $colws[$_], $row->[$_] } qw(0 1 2)
+$colws[1] += length $synthsufx;
+
+while (my (@row) = $q->fetchrow_array()) {
+ my $synth = shift @row;
+ $row[1] .= $synthsufx if $synth && $synth ne 'f'; # sqlite3 is typeless
+ printf "%-*s %-*s %-*s\n", map { $colws[$_], $row[$_] } qw(0 1 2)
or die $!;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 19/33] standalone-generate-dump-flight-runvars: Show synth runvars
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (17 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 18/33] mg-show-flight-runvars: Decorate synth runvar names with ~ Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 20/33] ts-host-alloc-Executive: Honour various hostalloc_* runvars Ian Jackson
` (13 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Pass -a to mg-show-flight-runvars. That way when we use the new
cs-job-create feature to set synth runvars during creation, we will
see them in the dump.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
standalone-generate-dump-flight-runvars | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/standalone-generate-dump-flight-runvars b/standalone-generate-dump-flight-runvars
index ed94792..da3c0f8 100755
--- a/standalone-generate-dump-flight-runvars
+++ b/standalone-generate-dump-flight-runvars
@@ -76,5 +76,5 @@ done
for proc in $procs; do
perproc
- ./mg-show-flight-runvars $flight | sed "s/^/`printf '%-26s ' $branch`/"
+ ./mg-show-flight-runvars -a $flight | sed "s/^/`printf '%-26s ' $branch`/"
done
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 20/33] ts-host-alloc-Executive: Honour various hostalloc_* runvars
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (18 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 19/33] standalone-generate-dump-flight-runvars: Show synth runvars Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 21/33] sg-check-tested: New --pass-job= option Ian Jackson
` (12 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
We honour
hostalloc_maxbonus_variation
hostalloc_bonus_previousfail
hostalloc_bonus_sharereuse
and make them default to their previous values.
These should be set as `synth' runvars during flight construction, so
that they are not copied into flights generated by cs-bisection-step
or cs-adjust-flight. cs-bisection-step makes its own arrangements for
host specification. So should the caller of cs-adjust-flight (perhaps
via the blessing system).
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Incorporate note about `synth'-ness in commit message.
---
ts-hosts-allocate-Executive | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/ts-hosts-allocate-Executive b/ts-hosts-allocate-Executive
index 781ddaf..eafcce2 100755
--- a/ts-hosts-allocate-Executive
+++ b/ts-hosts-allocate-Executive
@@ -541,14 +541,19 @@ sub hid_recurse ($$) {
my $log_variation_age = log(1+$variation_age/86400);
my $variation_bonus = $log_variation_age * 3600*2;
- my $max_variation_bonus = 12*3600;
+ my $max_variation_bonus = $r{hostalloc_maxbonus_variation} // 12*3600;
$variation_bonus=$max_variation_bonus
if $variation_bonus>$max_variation_bonus;
+ my $prevfail_bonus = $r{hostalloc_bonus_previousfail} // 7.0*86400;
+ my $prevfail_equiv_bonus = $prevfail_bonus * (6.5 / 7.0);
+
+ my $share_reuse_bonus = $r{hostalloc_bonus_sharereuse} // 10000;
+
my $cost= $start_time
+ $duration_for_cost
- - ($previously_failed ==@hids ? 7*86400 :
- $previously_failed_equiv==@hids ? 6.5*86400 :
+ - ($previously_failed ==@hids ? $prevfail_bonus :
+ $previously_failed_equiv==@hids ? $prevfail_equiv_bonus :
# We wait 7d extra to try a failing test on the same
# hardware, or 6.5d on `equivalent' hardware (as defined by
# equiv-* flags). Compared to `equivalent' hardware, we
@@ -556,7 +561,7 @@ sub hid_recurse ($$) {
0)
+ ($previously_failed || $previously_failed_equiv
? (-$max_variation_bonus+$variation_bonus) : -$variation_bonus)
- - $share_reuse * 10000;
+ - $share_reuse * $share_reuse_bonus;
print DEBUG "$dbg FINAL start=$start_time va=$variation_age".
" variation_bonus=$variation_bonus".
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 21/33] sg-check-tested: New --pass-job= option
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (19 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 20/33] ts-host-alloc-Executive: Honour various hostalloc_* runvars Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-18 9:30 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 22/33] cs-adjust-flight: Provide `jobs-list' operation Ian Jackson
` (11 subsequent siblings)
32 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Specifies that returned information should relate to a flight in which
a particular job existed and passed. The option can be repeated if
desired (to specify flights in which _all_ those jobs passed).
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: New patch
---
sg-check-tested | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/sg-check-tested b/sg-check-tested
index e503cf0..1a3afa3 100755
--- a/sg-check-tested
+++ b/sg-check-tested
@@ -86,6 +86,16 @@ END
my @blessings= split /\,/, $1;
push @conds_vars, @blessings;
push @conds, "(". (join " OR ", map { "blessing=?" } @blessings). ")";
+ } elsif (m/^--pass-job=(.*)$/) {
+ push @conds_vars, $1;
+ push @conds, <<END;
+ EXISTS
+ (SELECT 1
+ FROM jobs j
+ WHERE j.job = ?
+ AND j.flight = flights.flight
+ AND j.status = 'pass')
+END
} elsif (m/^--print-revision=(.*)$/) {
die if $prrev;
$prrev= $1;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 22/33] cs-adjust-flight: Provide `jobs-list' operation
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (20 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 21/33] sg-check-tested: New --pass-job= option Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-18 9:30 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 23/33] cs-adjust-flight: Break out job removal machinery Ian Jackson
` (10 subsequent siblings)
32 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
This makes no change to the target flight.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: New patch
---
cs-adjust-flight | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/cs-adjust-flight b/cs-adjust-flight
index 9e011c6..136ba5b 100755
--- a/cs-adjust-flight
+++ b/cs-adjust-flight
@@ -8,6 +8,7 @@
# <change>:
# copy <flight>
# copy-jobs <flight> <job-spec>
+# jobs-list <job-spec>
# runvar-set <job-spec> <var-spec> <value>
# runvar-del <job-spec> <var-spec>
# runvar-change <job-spec> <var-spec> <old-value> <new-value>
@@ -167,6 +168,16 @@ sub change__copy {
copy_jobs($srcflight, '/.');
}
+sub change__jobs_list {
+ die unless @changes >= 1;
+ my $jobspec = shift @changes;
+ for_jobs($dstflight, $jobspec, sub {
+ my ($job) = @_;
+ print $job, "\n" or die $!;
+ 1;
+ });
+}
+
sub change__copy_jobs {
die unless @changes >= 2;
my $srcflight = shift @changes;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 23/33] cs-adjust-flight: Break out job removal machinery
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (21 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 22/33] cs-adjust-flight: Provide `jobs-list' operation Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-18 9:31 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 24/33] cs-adjust-flight: Provide `jobs-del' operation Ian Jackson
` (9 subsequent siblings)
32 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Make @job_rm_qs a global variable (initialised idempotently by a new
function prep_rm_jobs) and $rm_job into a named global subroutine
do_rm_job.
No functional change.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: New patch
---
cs-adjust-flight | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/cs-adjust-flight b/cs-adjust-flight
index 136ba5b..4056765 100755
--- a/cs-adjust-flight
+++ b/cs-adjust-flight
@@ -133,11 +133,25 @@ sub for_jobs ($$$;$) {
'flight = ?', [$flight]);
}
+our @job_rm_qs;
+
+sub prep_rm_jobs () {
+ return if @job_rm_qs;
+ @job_rm_qs = map { $dbh_tests->prepare($_) }
+ ("DELETE FROM runvars WHERE flight = ? AND job = ?",
+ "DELETE FROM jobs WHERE flight = ? AND job = ?");
+}
+
+sub do_rm_job ($) {
+ my ($job) = @_;
+ my $count = 0;
+ $count += $_->execute($dstflight, $job) foreach @job_rm_qs;
+ verbose "$dstflight.$job job deleted\n" if $count;
+}
+
sub copy_jobs ($$) {
my ($srcflight, $jobs) = @_;
- my @job_rm_qs = map { $dbh_tests->prepare($_) }
- ("DELETE FROM runvars WHERE flight = ? AND job = ?",
- "DELETE FROM jobs WHERE flight = ? AND job = ?");
+ prep_rm_jobs();
my @job_copy_qs = map { $dbh_tests->prepare($_) }
("INSERT INTO jobs".
" SELECT ?, job, recipe, 'queued'".
@@ -147,14 +161,8 @@ sub copy_jobs ($$) {
" SELECT ?, job, name, val, 'f'".
" FROM runvars".
" WHERE flight = ? AND job = ? AND NOT synth");
- my $rm_job = sub {
- my ($job) = @_;
- my $count = 0;
- $count += $_->execute($dstflight, $job) foreach @job_rm_qs;
- verbose "$dstflight.$job job deleted\n" if $count;
- };
- for_jobs($dstflight, $jobs, $rm_job, 1);
- for_jobs($srcflight, $jobs, $rm_job);
+ for_jobs($dstflight, $jobs, \&do_rm_job, 1);
+ for_jobs($srcflight, $jobs, \&do_rm_job);
for_jobs($srcflight, $jobs, sub {
my ($job) = @_;
$_->execute($dstflight, $srcflight, $job) foreach @job_copy_qs;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 24/33] cs-adjust-flight: Provide `jobs-del' operation
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (22 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 23/33] cs-adjust-flight: Break out job removal machinery Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-18 9:31 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 25/33] New utility mg-adjust-flight-makexrefs Ian Jackson
` (8 subsequent siblings)
32 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: New patch
---
cs-adjust-flight | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/cs-adjust-flight b/cs-adjust-flight
index 4056765..04ab6fe 100755
--- a/cs-adjust-flight
+++ b/cs-adjust-flight
@@ -186,6 +186,13 @@ sub change__jobs_list {
});
}
+sub change__jobs_del {
+ die unless @changes >= 1;
+ my $jobspec = shift @changes;
+ prep_rm_jobs();
+ for_jobs($dstflight, $jobspec, \&do_rm_job, 1);
+}
+
sub change__copy_jobs {
die unless @changes >= 2;
my $srcflight = shift @changes;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 25/33] New utility mg-adjust-flight-makexrefs
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (23 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 24/33] cs-adjust-flight: Provide `jobs-del' operation Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-18 9:47 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 26/33] make-flight: Contemplate varying architecture for Debian HVM Ian Jackson
` (7 subsequent siblings)
32 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
This provides a fairly cooked way of adjusting an existing flight to
reuse previous builds.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: New patch
---
mg-adjust-flight-makexrefs | 83 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
create mode 100755 mg-adjust-flight-makexrefs
diff --git a/mg-adjust-flight-makexrefs b/mg-adjust-flight-makexrefs
new file mode 100755
index 0000000..ebbac15
--- /dev/null
+++ b/mg-adjust-flight-makexrefs
@@ -0,0 +1,83 @@
+#!/bin/bash
+#
+# usage: ./mg-adjust-flight-makexrefs [OPTIONS..] FLIGHT \
+# '[!]JOB-GLOB ...' \
+# REF-CONDS...
+#
+# JOB-GLOB is as for shell `case'. Sense of first match is used.
+# If no match for a job, uses reverse of sense of last glob.
+#
+# ! means keep such jobs in FLIGHT. Without ! means delete each such
+# job from FLIGHT and replace intra-flight references to it with
+# references to the same job in a suitable other flight.
+#
+# `Suitable' means one in which the required job passed, subject to
+# REF-CONDS (which are passed to sg-check-tested). REF-CONDS really
+# ought to include --blessings=BLESSING,... and should probably also
+# include some --branch=REF-BRANCH.
+#
+# Options:
+# -v Pass -v to cs-adjust-flight
+# -D Print our own debugging output to stderr (consider
+# passing --debug in REF-CONDS too)
+# -n Dry run: do not actually run cs-adjust-flight
+
+set -e
+
+exec 3>/dev/null
+verbose=''
+
+badusage () { echo >&2 "$0: bad usage"; exit 1; }
+
+while true; do
+ case "$1" in
+ -n) dryrun="echo" ;;
+ -v) verbose=-v ;;
+ -D) exec 3>&2 ;;
+ -*) badusage ;;
+ *) break ;;
+ esac
+ shift
+done
+
+if [ $# -le 2 ]; then badusage; fi
+
+flight=$1; shift
+keepjobs=$1; shift
+
+for j in `./cs-adjust-flight $flight jobs-list '^build-'`; do
+
+ tokeep=continue
+ todelete=:
+
+ for glob in $keepjobs; do
+ case "$glob" in
+ !*) ifmatch=$tokeep; action=$todelete ; glob="${glob#!}" ;;
+ *) ifmatch=$todelete; action=$tokeep ;;
+ esac
+
+ case "$j" in
+ $glob)
+ action=$ifmatch
+ echo >&3 "ADJUST XREF $j match=$glob $action"
+ break
+ ;;
+ esac
+ done
+
+ # `doaction=continue' => job remains
+ # `doaction=:' => job gets deleted
+ echo >&3 "ADJUST XREF $j ACTION $action"
+ $action
+
+ # OK, process $j
+
+ ref=`./sg-check-tested --pass-job="$j" "$@"`
+ echo >&3 "ADJUST XREF $j r=$ref"
+ if [ "x$ref" = x ]; then continue; fi
+
+ $dryrun \
+ ./cs-adjust-flight $verbose $flight \
+ runvar-change . '/buildjob$' "$j" "$ref.$j" \
+ jobs-del "$j"
+done
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 26/33] make-flight: Contemplate varying architecture for Debian HVM
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (24 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 25/33] New utility mg-adjust-flight-makexrefs Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 27/33] make-flight: Run job_create_test_filter_callback on true job name Ian Jackson
` (6 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
In the Debian hvm tests, ask branch_debianhvm_arch for the
architecture to use. This currently prints only amd64.
While we are here, provide some comments about the (somewhat
confusing) argument conventions of do_hvm_debian_test_one.
No functional change yet.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
make-flight | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/make-flight b/make-flight
index 00f797e..13674b8 100755
--- a/make-flight
+++ b/make-flight
@@ -220,12 +220,20 @@ do_hvm_win7_x64_tests () {
all_hostflags=$most_hostflags,hvm
}
+branch_debianhvm_arch () {
+ case $branch in
+ *) echo amd64;;
+ esac
+}
+
do_hvm_debian_test_one () {
testname=$1
toolstack=$2
bios=$3
- xsm=$4
- stubdom=$5
+ xsm=$4 # 'false' or 'true'
+ stubdom=$5 # '' (or unset) or 'true'
+
+ local arch=$(branch_debianhvm_arch)
stubdom_suffix=""
stubdom_runvar=""
@@ -234,11 +242,11 @@ do_hvm_debian_test_one () {
stubdom_runvar="debianhvm_stubdom=$stubdom"
fi
- job_create_test test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix$stubdom_suffix-$testname-amd64\
+ job_create_test test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix$stubdom_suffix-$testname-$arch\
test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \
enable_xsm=$xsm \
$stubdom_runvar \
- debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
+ debianhvm_image=debian-7.2.0-$arch-CD-1.iso \
bios=$bios \
all_hostflags=$most_hostflags,hvm
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 27/33] make-flight: Run job_create_test_filter_callback on true job name
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (25 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 26/33] make-flight: Contemplate varying architecture for Debian HVM Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 28/33] make-flight: mfi-common: Honour $global_runvars Ian Jackson
` (5 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
job_create_test would pass $job to job_create_test_filter_callback but
then later maybe append -xsm to it. Fix this.
No functional change for existing in-tree code because all existing
tests of the $job end in *.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Fix textual conflict after dropping "make-flight: Allow separate
specification of pre-built Xen vs others"
---
mfi-common | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/mfi-common b/mfi-common
index aaaeac9..f83e9ec 100644
--- a/mfi-common
+++ b/mfi-common
@@ -311,8 +311,6 @@ create_build_jobs () {
}
job_create_test () {
- job_create_test_filter_callback "$@" || return 0
-
local job=$1; shift
local recipe=$1; shift
local toolstack=$1; shift
@@ -327,6 +325,10 @@ job_create_test () {
job="$job$xsm_suffix"
xenbuildjob="${bfi}build-$xenarch$xsm_suffix"
buildjob="${bfi}build-$dom0arch$xsm_suffix"
+
+ job_create_test_filter_callback \
+ "$job" "$recipe" "$toolstack" "$xenarch" "$dom0arch" "$@" || return 0
+
tsbuildjob=
case "$xenbranch:$toolstack" in
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 28/33] make-flight: mfi-common: Honour $global_runvars
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (26 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 27/33] make-flight: Run job_create_test_filter_callback on true job name Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 29/33] make-flight: Provide xen-unstable-smoke branch Ian Jackson
` (4 subsequent siblings)
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Provide a way for the main script to set some runvars on all jobs. We
expect this to be mostly set with +=.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
mfi-common | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mfi-common b/mfi-common
index f83e9ec..570dae2 100644
--- a/mfi-common
+++ b/mfi-common
@@ -69,7 +69,7 @@ job_create_build () {
local job=$1; shift
local recipe=$1; shift
- ./cs-job-create $flight $job $recipe "$@"
+ ./cs-job-create $flight $job $recipe $global_runvars "$@"
}
create_build_jobs () {
@@ -345,7 +345,7 @@ job_create_test () {
esac
./cs-job-create $flight $job $recipe toolstack=$toolstack \
- $RUNVARS $TEST_RUNVARS $most_runvars \
+ $RUNVARS $TEST_RUNVARS $global_runvars $most_runvars \
xenbuildjob=$xenbuildjob buildjob=$buildjob $tsbuildjob "$@"
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 29/33] make-flight: Provide xen-unstable-smoke branch
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (27 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 28/33] make-flight: mfi-common: Honour $global_runvars Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-18 9:50 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 30/33] cr-daily-branch: Use mg-adjust-flight to have smoke tests reuse builds Ian Jackson
` (3 subsequent siblings)
32 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
This contains a very limited set of jobs
test-amd64-amd64-libvirt
test-amd64-amd64-xl-qemuu-debianhvm-i386
test-armhf-armhf-xl
and the builds they depend on.
The debianhvm job exists only in this flight, and is generated by
having branch_debianhvm_arch return i386 instead of amd64. This is so
that this branch contains a 32-bit x86 guest as well as a 64-bit one.
We override host allocator parameters to make this flight not care
about host stickiness: it just takes whatever comes to hand. These
runvars are marked `synth' so that cs-bisection-step and
cs-adjust-flight do not copy them, as discussed in previous patches.
Later we will arrange to reuse previous builds for the build artefacts
which aren't intended subjects of the smoke test.
(Deployment note: This needs images/debian-7.2.0-i386-CD-1.iso which I
have already placed in the Cambridge and Xen Project instances.)
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: Generate all the jobs that this flight's tests use, and add
note about this to the commit message.
Mention `synth'-ness of hostalloc runvars in commit message.
Image is in Xen Project test colo too.
---
make-flight | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/make-flight b/make-flight
index 13674b8..c1f40b9 100755
--- a/make-flight
+++ b/make-flight
@@ -34,8 +34,28 @@ flight=`./cs-flight-create $blessing $branch`
defsuite=`getconfig DebianSuite`
defguestsuite=`getconfig GuestDebianSuite`
+case "$branch" in
+xen-unstable-smoke)
+ global_runvars+=" hostalloc_maxbonus_variation~=0 "
+ global_runvars+=" hostalloc_bonus_previousfail~=0 "
+ ;;
+esac
+
job_create_build_filter_callback () {
- :
+ local job=$1; shift
+ case "$branch" in
+ xen-unstable-smoke)
+ case "$job" in
+ build-amd64) ;;
+ build-amd64-pvops) ;;
+ build-amd64-libvirt) ;;
+ build-armhf) ;;
+ build-armhf-pvops) ;;
+ *) return 1 ;;
+ esac
+ ;;
+ esac
+ return 0
}
if [ x$buildflight = x ]; then
@@ -56,6 +76,14 @@ job_create_test_filter_callback () {
local dom0arch=$1; shift
case "$branch" in
+ xen-unstable-smoke)
+ case "$job" in
+ test-amd64-amd64-libvirt) return 0 ;;
+ test-armhf-armhf-xl) return 0 ;;
+ test-amd64-amd64-xl-qemuu-debianhvm-i386) return 0 ;;
+ *) return 1 ;;
+ esac
+ ;;
qemu-upstream-4.2-testing)
case " $* " in
*" device_model_version=qemu-xen "*)
@@ -222,6 +250,7 @@ do_hvm_win7_x64_tests () {
branch_debianhvm_arch () {
case $branch in
+ xen-unstable-smoke) echo i386;;
*) echo amd64;;
esac
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 30/33] cr-daily-branch: Use mg-adjust-flight to have smoke tests reuse builds
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (28 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 29/33] make-flight: Provide xen-unstable-smoke branch Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-18 9:52 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 31/33] cri-common: Support xen-unstable-smoke Ian Jackson
` (2 subsequent siblings)
32 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
The smoke tests are for testing xen-unstable. We want to avoid
building anything else. So arrange to reuse previous builds by
calling mg-adjust-flight-makexrefs.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: New patch
---
cr-daily-branch | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/cr-daily-branch b/cr-daily-branch
index 9500bdc..6a5124a 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -276,7 +276,17 @@ if [ "x$NEW_REVISION" = "x$OLD_REVISION" ]; then
fi
$DAILY_BRANCH_PREMAKE_HOOK
+
flight=`$makeflight $branch $xenbranch $OSSTEST_BLESSING "$@"`
+
+case $branch in
+xen-unstable-smoke)
+ ./mg-adjust-flight-makexrefs -v $flight \
+ '!build-amd64 !build-armhf build-*' \
+ --debug --branch=xen-unstable --blessings=real
+ ;;
+esac
+
$DAILY_BRANCH_POSTMAKE_HOOK
heading=tmp/$flight.heading-info
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 31/33] cri-common: Support xen-unstable-smoke
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (29 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 30/33] cr-daily-branch: Use mg-adjust-flight to have smoke tests reuse builds Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 32/33] ap-*: Be able to fetch and push xen.git#smoke Ian Jackson
2015-09-17 17:38 ` [OSSTEST PATCH 33/33] crontab: Enable xen-unstable-smoke branch every 3h at <1mod3>:51 UTC Ian Jackson
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Add this branch to select_xenbranch. This works like xen-unstable in
most respects. We are going to sort out the push gate ref plumbing in
xen.git in the next osstest patch.
Also, use a branch-settings file to set its resource priority to -20
to make it run ahead of anything else automatic.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
README.planner | 1 +
branch-settings.xen-unstable-smoke | 1 +
cri-common | 1 +
3 files changed, 3 insertions(+)
create mode 100644 branch-settings.xen-unstable-smoke
diff --git a/README.planner b/README.planner
index dfa623e..3a491a4 100644
--- a/README.planner
+++ b/README.planner
@@ -87,6 +87,7 @@ in the more distant future.
Values for OSSTEST_RESOURCE_PRIORITY:
mg-allocate -1000000
mg-blockage -2000000
+ xen-unstable-smoke cr-daily-branch -20
default Executive.pm with controlling terminal -10
mg-execute-flight -8
default 0
diff --git a/branch-settings.xen-unstable-smoke b/branch-settings.xen-unstable-smoke
new file mode 100644
index 0000000..b73bc6a
--- /dev/null
+++ b/branch-settings.xen-unstable-smoke
@@ -0,0 +1 @@
+export OSSTEST_RESOURCE_PRIORITY=-20
diff --git a/cri-common b/cri-common
index 94696ab..a31004a 100644
--- a/cri-common
+++ b/cri-common
@@ -80,6 +80,7 @@ select_prevxenbranch () {
select_xenbranch () {
case "$branch" in
+ xen-unstable-smoke) tree=xen; xenbranch=xen-unstable ;;
xen-*) tree=xen; xenbranch=$branch ;;
qemu-mainline) tree=qemuu; xenbranch=xen-unstable qemuubranch=qemu-mainline;;
qemu-upstream-*) tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 32/33] ap-*: Be able to fetch and push xen.git#smoke
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (30 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 31/33] cri-common: Support xen-unstable-smoke Ian Jackson
@ 2015-09-17 17:37 ` Ian Jackson
2015-09-17 17:38 ` [OSSTEST PATCH 33/33] crontab: Enable xen-unstable-smoke branch every 3h at <1mod3>:51 UTC Ian Jackson
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:37 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
The branches and push gates are now:
xen.git#staging -[xen-unstable-smoke]-> #smoke -[xen-unstable]-> #master
Deployment note: When this passes the osstest self-push-gate, the main
xen-unstable flight will start using smoke as an input. Therefore,
until the new cronjob is installed to run the xen-unstable-smoke
tests, an automatic process should keep xen.git#smoke up to date with
xen.git#staging. Eg, running in screen in xen@xenbits:~/git/xen.git:
while sleep 1800; do git fetch . staging:smoke; done
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: `xen.git#smoked' branch name changed to `#smoke'
---
ap-fetch-version | 3 +++
ap-fetch-version-old | 3 +++
ap-push | 4 ++++
3 files changed, 10 insertions(+)
diff --git a/ap-fetch-version b/ap-fetch-version
index 488ea55..62adf79 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -40,6 +40,9 @@ xen-3.*)
' x
;;
xen-unstable)
+ repo_tree_rev_fetch_git xen $TREE_XEN smoke $LOCALREV_XEN
+ ;;
+xen-unstable-smoke)
repo_tree_rev_fetch_git xen $TREE_XEN staging $LOCALREV_XEN
;;
xen-4.*-testing)
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 7b918e3..716fc8f 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -50,6 +50,9 @@ xen-3.*)
xen-unstable)
repo_tree_rev_fetch_git xen $TREE_XEN master $LOCALREV_XEN
;;
+xen-unstable-smoke)
+ repo_tree_rev_fetch_git xen $TREE_XEN smoke $LOCALREV_XEN
+ ;;
xen-4.*-testing)
branchcore=${branch#xen-}
branchcore=${branchcore%-testing}
diff --git a/ap-push b/ap-push
index 1dd5b05..aa0ec3d 100755
--- a/ap-push
+++ b/ap-push
@@ -54,6 +54,10 @@ xen-unstable)
cd $repos/xen
git push $TREE_XEN $revision:refs/heads/master
;;
+xen-unstable-smoke)
+ cd $repos/xen
+ git push $TREE_XEN $revision:refs/heads/smoke
+ ;;
xen-*-testing)
cd $repos/xen
xenversion=$branch
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [OSSTEST PATCH 33/33] crontab: Enable xen-unstable-smoke branch every 3h at <1mod3>:51 UTC
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
` (31 preceding siblings ...)
2015-09-17 17:37 ` [OSSTEST PATCH 32/33] ap-*: Be able to fetch and push xen.git#smoke Ian Jackson
@ 2015-09-17 17:38 ` Ian Jackson
32 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-17 17:38 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Campbell
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
crontab | 1 +
1 file changed, 1 insertion(+)
diff --git a/crontab b/crontab
index 436645b..b9d4ad1 100644
--- a/crontab
+++ b/crontab
@@ -2,6 +2,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
MAILTO=ian.jackson@citrix.com,ian.campbell@eu.citrix.com
# m h dom mon dow command
49 1 * * * cd testing.git && BRANCHES_ALWAYS=xen-unstable ./cr-for-branches branches -w "./cr-daily-branch --real"
+51 1-23/3 * * * cd testing.git && BRANCHES=xen-unstable-smoke ./cr-for-branches branches -w "./cr-daily-branch --real"
4-59/30 * * * * cd testing.git && ./cr-for-branches branches -q "./cr-daily-branch --real"
18 9 * * 1,3,5 cd testing.git && BRANCHES=linux-next ./cr-for-branches branches -w "./cr-daily-branch --real"
18 4 * * * cd testing.git && BRANCHES='linux-linus linux-mingo-tip-master linux-3.0 libvirt rumpuserxen' ./cr-for-branches branches -w "./cr-daily-branch --real"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 07/33] memoise: New utility
2015-09-17 17:37 ` [OSSTEST PATCH 07/33] memoise: New utility Ian Jackson
@ 2015-09-18 9:25 ` Ian Campbell
0 siblings, 0 replies; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 9:25 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> Give this a GPLv2+ licence so that we can move it into some other
> FLOSS package later.
>
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com?
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 09/33] standalone mode: Fix two SQL `TRUE's
2015-09-17 17:37 ` [OSSTEST PATCH 09/33] standalone mode: Fix two SQL `TRUE's Ian Jackson
@ 2015-09-18 9:26 ` Ian Campbell
0 siblings, 0 replies; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 9:26 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> SQL has no portable boolean true literal (really). SQLite3 does not
> understand `TRUE'. Use `1=1' instead.
>
> This means that mg-show-flight-runvars -a will work in standalone
> mode.
>
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 18/33] mg-show-flight-runvars: Decorate synth runvar names with ~
2015-09-17 17:37 ` [OSSTEST PATCH 18/33] mg-show-flight-runvars: Decorate synth runvar names with ~ Ian Jackson
@ 2015-09-18 9:27 ` Ian Campbell
0 siblings, 0 replies; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 9:27 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> Make mg-show-flight-runvars -a append ~ to the names of synth runvars.
> (This is consistent with the new syntax in cs-job-create.)
>
> We do this by editing $row[1] (and $colws[1]) so we can avoid
> disturbing the general column format calculation and printing.
>
> We switch to fetchrow_array rather than fetchrow_arrayref. This is
> clearer and also avoids having to copy $row (because the value in the
> DB $row from fetchrow_hashref would be readonly).
>
> We have to check for $synth eq 'f' as well as $synth being boolean
> false, because SQLite's typeless nature (or, to put it another way,
> DBD::SQLite's failure to look at the schema) means that a boolean
> field's value of 'f' or 't' is simply returned as a string to Perl.
> But of course "f" is trueish in Perl.
>
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 21/33] sg-check-tested: New --pass-job= option
2015-09-17 17:37 ` [OSSTEST PATCH 21/33] sg-check-tested: New --pass-job= option Ian Jackson
@ 2015-09-18 9:30 ` Ian Campbell
0 siblings, 0 replies; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 9:30 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> Specifies that returned information should relate to a flight in which
> a particular job existed and passed. The option can be repeated if
> desired (to specify flights in which _all_ those jobs passed).
>
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 22/33] cs-adjust-flight: Provide `jobs-list' operation
2015-09-17 17:37 ` [OSSTEST PATCH 22/33] cs-adjust-flight: Provide `jobs-list' operation Ian Jackson
@ 2015-09-18 9:30 ` Ian Campbell
0 siblings, 0 replies; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 9:30 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> This makes no change to the target flight.
>
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 23/33] cs-adjust-flight: Break out job removal machinery
2015-09-17 17:37 ` [OSSTEST PATCH 23/33] cs-adjust-flight: Break out job removal machinery Ian Jackson
@ 2015-09-18 9:31 ` Ian Campbell
0 siblings, 0 replies; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 9:31 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> Make @job_rm_qs a global variable (initialised idempotently by a new
> function prep_rm_jobs) and $rm_job into a named global subroutine
> do_rm_job.
>
> No functional change.
>
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 24/33] cs-adjust-flight: Provide `jobs-del' operation
2015-09-17 17:37 ` [OSSTEST PATCH 24/33] cs-adjust-flight: Provide `jobs-del' operation Ian Jackson
@ 2015-09-18 9:31 ` Ian Campbell
2015-09-18 11:13 ` Ian Jackson
0 siblings, 1 reply; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 9:31 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Missing an update to the comment describing the sub commands provided by
this too.
With that added:
Acked-by: Ian Campbell < ian.campbell@citrix.com >
> ---
> v2: New patch
> ---
> cs-adjust-flight | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/cs-adjust-flight b/cs-adjust-flight
> index 4056765..04ab6fe 100755
> --- a/cs-adjust-flight
> +++ b/cs-adjust-flight
> @@ -186,6 +186,13 @@ sub change__jobs_list {
> });
> }
>
> +sub change__jobs_del {
> + die unless @changes >= 1;
> + my $jobspec = shift @changes;
> + prep_rm_jobs();
> + for_jobs($dstflight, $jobspec, \&do_rm_job, 1);
> +}
> +
> sub change__copy_jobs {
> die unless @changes >= 2;
> my $srcflight = shift @changes;
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 25/33] New utility mg-adjust-flight-makexrefs
2015-09-17 17:37 ` [OSSTEST PATCH 25/33] New utility mg-adjust-flight-makexrefs Ian Jackson
@ 2015-09-18 9:47 ` Ian Campbell
0 siblings, 0 replies; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 9:47 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> This provides a fairly cooked way of adjusting an existing flight to
> reuse previous builds.
>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
How exciting.
Acked-by: Ian Campbell <ian.campbell@citrix.com>
> ---
> v2: New patch
> ---
> mg-adjust-flight-makexrefs | 83
> ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 83 insertions(+)
> create mode 100755 mg-adjust-flight-makexrefs
>
> diff --git a/mg-adjust-flight-makexrefs b/mg-adjust-flight-makexrefs
> new file mode 100755
> index 0000000..ebbac15
> --- /dev/null
> +++ b/mg-adjust-flight-makexrefs
> @@ -0,0 +1,83 @@
> +#!/bin/bash
> +#
> +# usage: ./mg-adjust-flight-makexrefs [OPTIONS..] FLIGHT \
> +# '[!]JOB-GLOB ...' \
> +# REF-CONDS...
> +#
> +# JOB-GLOB is as for shell `case'. Sense of first match is used.
> +# If no match for a job, uses reverse of sense of last glob.
> +#
> +# ! means keep such jobs in FLIGHT. Without ! means delete each such
> +# job from FLIGHT and replace intra-flight references to it with
> +# references to the same job in a suitable other flight.
> +#
> +# `Suitable' means one in which the required job passed, subject to
> +# REF-CONDS (which are passed to sg-check-tested). REF-CONDS really
> +# ought to include --blessings=BLESSING,... and should probably also
> +# include some --branch=REF-BRANCH.
> +#
> +# Options:
> +# -v Pass -v to cs-adjust-flight
> +# -D Print our own debugging output to stderr (consider
> +# passing --debug in REF-CONDS too)
> +# -n Dry run: do not actually run cs-adjust-flight
> +
> +set -e
> +
> +exec 3>/dev/null
> +verbose=''
> +
> +badusage () { echo >&2 "$0: bad usage"; exit 1; }
> +
> +while true; do
> + case "$1" in
> + -n) dryrun="echo" ;;
> + -v) verbose=-v ;;
> + -D) exec 3>&2 ;;
> + -*) badusage ;;
> + *) break ;;
> + esac
> + shift
> +done
> +
> +if [ $# -le 2 ]; then badusage; fi
> +
> +flight=$1; shift
> +keepjobs=$1; shift
> +
> +for j in `./cs-adjust-flight $flight jobs-list '^build-'`; do
> +
> + tokeep=continue
> + todelete=:
> +
> + for glob in $keepjobs; do
> + case "$glob" in
> + !*) ifmatch=$tokeep; action=$todelete ; glob="${glob#!}"
> ;;
> + *) ifmatch=$todelete; action=$tokeep ;;
> + esac
> +
> + case "$j" in
> + $glob)
> + action=$ifmatch
> + echo >&3 "ADJUST XREF $j match=$glob $action"
> + break
> + ;;
> + esac
> + done
> +
> + # `doaction=continue' => job remains
> + # `doaction=:' => job gets deleted
> + echo >&3 "ADJUST XREF $j ACTION $action"
> + $action
> +
> + # OK, process $j
> +
> + ref=`./sg-check-tested --pass-job="$j" "$@"`
> + echo >&3 "ADJUST XREF $j r=$ref"
> + if [ "x$ref" = x ]; then continue; fi
> +
> + $dryrun \
> + ./cs-adjust-flight $verbose $flight \
> + runvar-change . '/buildjob$' "$j" "$ref.$j" \
> + jobs-del "$j"
> +done
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 29/33] make-flight: Provide xen-unstable-smoke branch
2015-09-17 17:37 ` [OSSTEST PATCH 29/33] make-flight: Provide xen-unstable-smoke branch Ian Jackson
@ 2015-09-18 9:50 ` Ian Campbell
2015-09-18 11:18 ` Ian Jackson
0 siblings, 1 reply; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 9:50 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> This contains a very limited set of jobs
> test-amd64-amd64-libvirt
> test-amd64-amd64-xl-qemuu-debianhvm-i386
> test-armhf-armhf-xl
> and the builds they depend on.
>
> The debianhvm job exists only in this flight, and is generated by
> having branch_debianhvm_arch return i386 instead of amd64. This is so
> that this branch contains a 32-bit x86 guest as well as a 64-bit one.
>
> We override host allocator parameters to make this flight not care
> about host stickiness: it just takes whatever comes to hand. These
> runvars are marked `synth' so that cs-bisection-step and
> cs-adjust-flight do not copy them, as discussed in previous patches.
Didn't you drop it from those previous patches with the intention of moving
it here?
Everything else looks good.
> Later we will arrange to reuse previous builds for the build artefacts
> which aren't intended subjects of the smoke test.
>
> (Deployment note: This needs images/debian-7.2.0-i386-CD-1.iso which I
> have already placed in the Cambridge and Xen Project instances.)
>
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> ---
> v2: Generate all the jobs that this flight's tests use, and add
> note about this to the commit message.
> Mention `synth'-ness of hostalloc runvars in commit message.
> Image is in Xen Project test colo too.
> ---
> make-flight | 31 ++++++++++++++++++++++++++++++-
> 1 file changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/make-flight b/make-flight
> index 13674b8..c1f40b9 100755
> --- a/make-flight
> +++ b/make-flight
> @@ -34,8 +34,28 @@ flight=`./cs-flight-create $blessing $branch`
> defsuite=`getconfig DebianSuite`
> defguestsuite=`getconfig GuestDebianSuite`
>
> +case "$branch" in
> +xen-unstable-smoke)
> + global_runvars+=" hostalloc_maxbonus_variation~=0 "
> + global_runvars+=" hostalloc_bonus_previousfail~=0 "
> + ;;
> +esac
> +
> job_create_build_filter_callback () {
> - :
> + local job=$1; shift
> + case "$branch" in
> + xen-unstable-smoke)
> + case "$job" in
> + build-amd64) ;;
> + build-amd64-pvops) ;;
> + build-amd64-libvirt) ;;
> + build-armhf) ;;
> + build-armhf-pvops) ;;
> + *) return 1 ;;
> + esac
> + ;;
> + esac
> + return 0
> }
>
> if [ x$buildflight = x ]; then
> @@ -56,6 +76,14 @@ job_create_test_filter_callback () {
> local dom0arch=$1; shift
>
> case "$branch" in
> + xen-unstable-smoke)
> + case "$job" in
> + test-amd64-amd64-libvirt) return 0 ;;
> + test-armhf-armhf-xl) return 0 ;;
> + test-amd64-amd64-xl-qemuu-debianhvm-i386) return 0 ;;
> + *) return 1 ;;
> + esac
> + ;;
> qemu-upstream-4.2-testing)
> case " $* " in
> *" device_model_version=qemu-xen "*)
> @@ -222,6 +250,7 @@ do_hvm_win7_x64_tests () {
>
> branch_debianhvm_arch () {
> case $branch in
> + xen-unstable-smoke) echo i386;;
> *) echo amd64;;
> esac
> }
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 30/33] cr-daily-branch: Use mg-adjust-flight to have smoke tests reuse builds
2015-09-17 17:37 ` [OSSTEST PATCH 30/33] cr-daily-branch: Use mg-adjust-flight to have smoke tests reuse builds Ian Jackson
@ 2015-09-18 9:52 ` Ian Campbell
2015-09-18 11:19 ` Ian Jackson
0 siblings, 1 reply; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 9:52 UTC (permalink / raw)
To: Ian Jackson, xen-devel
On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> The smoke tests are for testing xen-unstable. We want to avoid
> building anything else. So arrange to reuse previous builds by
> calling mg-adjust-flight-makexrefs.
>
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> ---
> v2: New patch
> ---
> cr-daily-branch | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/cr-daily-branch b/cr-daily-branch
> index 9500bdc..6a5124a 100755
> --- a/cr-daily-branch
> +++ b/cr-daily-branch
> @@ -276,7 +276,17 @@ if [ "x$NEW_REVISION" = "x$OLD_REVISION" ]; then
> fi
>
> $DAILY_BRANCH_PREMAKE_HOOK
> +
> flight=`$makeflight $branch $xenbranch $OSSTEST_BLESSING "$@"`
> +
> +case $branch in
> +xen-unstable-smoke)
> + ./mg-adjust-flight-makexrefs -v $flight \
> + '!build-amd64 !build-armhf build-*' \
> + --debug --branch=xen-unstable --blessings=real
$blessings_arg might be better than an open coded real?
Oh, I see, you want to only pickup real builds, even for adhoc or play
jobs. That makes sense. Maybe with say so either in a comment or the commit
message?
Otherwise:
Acked-by: Ian Campbell <ian.campbell@citrix.com>
> + ;;
> +esac
> +
> $DAILY_BRANCH_POSTMAKE_HOOK
>
> heading=tmp/$flight.heading-info
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 24/33] cs-adjust-flight: Provide `jobs-del' operation
2015-09-18 9:31 ` Ian Campbell
@ 2015-09-18 11:13 ` Ian Jackson
0 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-18 11:13 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("Re: [OSSTEST PATCH 24/33] cs-adjust-flight: Provide `jobs-del' operation"):
> On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
>
> Missing an update to the comment describing the sub commands provided by
> this too.
Oops, fixed.
> With that added:
> Acked-by: Ian Campbell < ian.campbell@citrix.com >
Thanks,
Ian.
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 29/33] make-flight: Provide xen-unstable-smoke branch
2015-09-18 9:50 ` Ian Campbell
@ 2015-09-18 11:18 ` Ian Jackson
2015-09-18 11:23 ` Ian Campbell
0 siblings, 1 reply; 48+ messages in thread
From: Ian Jackson @ 2015-09-18 11:18 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("Re: [OSSTEST PATCH 29/33] make-flight: Provide xen-unstable-smoke branch"):
> On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
...
> > We override host allocator parameters to make this flight not care
> > about host stickiness: it just takes whatever comes to hand. These
> > runvars are marked `synth' so that cs-bisection-step and
> > cs-adjust-flight do not copy them, as discussed in previous patches.
>
> Didn't you drop it from those previous patches with the intention of moving
> it here?
There is still (necessarily) some remaining discussion of the
motivation and semantics in the earlier patches - in particular in
cs-job-create: Permit creation of `synth' runvars
ts-host-alloc-Executive: Honour various hostalloc_* runvars
Ian.
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 30/33] cr-daily-branch: Use mg-adjust-flight to have smoke tests reuse builds
2015-09-18 9:52 ` Ian Campbell
@ 2015-09-18 11:19 ` Ian Jackson
0 siblings, 0 replies; 48+ messages in thread
From: Ian Jackson @ 2015-09-18 11:19 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("Re: [OSSTEST PATCH 30/33] cr-daily-branch: Use mg-adjust-flight to have smoke tests reuse builds"):
> $blessings_arg might be better than an open coded real?
>
> Oh, I see, you want to only pickup real builds, even for adhoc or play
> jobs. That makes sense. Maybe with say so either in a comment or the commit
> message?
Indeed. I have added a comment.
> Otherwise:
>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
Thanks,
Ian.
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [OSSTEST PATCH 29/33] make-flight: Provide xen-unstable-smoke branch
2015-09-18 11:18 ` Ian Jackson
@ 2015-09-18 11:23 ` Ian Campbell
0 siblings, 0 replies; 48+ messages in thread
From: Ian Campbell @ 2015-09-18 11:23 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Fri, 2015-09-18 at 12:18 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [OSSTEST PATCH 29/33] make-flight: Provide xen
> -unstable-smoke branch"):
> > On Thu, 2015-09-17 at 18:37 +0100, Ian Jackson wrote:
> ...
> > > We override host allocator parameters to make this flight not care
> > > about host stickiness: it just takes whatever comes to hand. These
> > > runvars are marked `synth' so that cs-bisection-step and
> > > cs-adjust-flight do not copy them, as discussed in previous patches.
> >
> > Didn't you drop it from those previous patches with the intention of
> > moving
> > it here?
>
> There is still (necessarily) some remaining discussion of the
> motivation and semantics in the earlier patches - in particular in
> cs-job-create: Permit creation of `synth' runvars
> ts-host-alloc-Executive: Honour various hostalloc_* runvars
Thanks, I'd failed to spot those.
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
end of thread, other threads:[~2015-09-18 11:23 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-17 17:37 [OSSTEST PATCH v2 00/33] xen.git#staging smoke tests Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 01/33] docs: Document OSSTEST_RESOURCE_PRIORITY values in README.planner Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 02/33] Executive: cs-job-create: Check that OSSTEST_FLIGHT is not set Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 03/33] mg-list-all-branches: Suppress `maintjobs' Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 04/33] standalone: Do not blunder on after errors Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 05/33] standalone: Set very long SQLite3 busy timeout in Perl Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 06/33] cr-daily-branch: Honour AP_FETCH_PFX Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 07/33] memoise: New utility Ian Jackson
2015-09-18 9:25 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 08/33] standalone-generate-dump-flight-runvars: memoise ap-fetch Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 09/33] standalone mode: Fix two SQL `TRUE's Ian Jackson
2015-09-18 9:26 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 10/33] mfi-common: Use job_create_build for build-*-prev Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 11/33] ap-fetch-version*: Unwrap xen-unstable lines Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 12/33] ap-push: Use refs/heads/ for destinations Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 13/33] cr-ensure-disk-space: Honour -D Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 14/33] cr-ensure-disk-space: Look at referring flights Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 15/33] cr-ensure-disk-space: Make main loop body into a subroutine Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 16/33] cr-ensure-disk-space: Take the flights db lock Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 17/33] cs-job-create: Permit creation of `synth' runvars Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 18/33] mg-show-flight-runvars: Decorate synth runvar names with ~ Ian Jackson
2015-09-18 9:27 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 19/33] standalone-generate-dump-flight-runvars: Show synth runvars Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 20/33] ts-host-alloc-Executive: Honour various hostalloc_* runvars Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 21/33] sg-check-tested: New --pass-job= option Ian Jackson
2015-09-18 9:30 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 22/33] cs-adjust-flight: Provide `jobs-list' operation Ian Jackson
2015-09-18 9:30 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 23/33] cs-adjust-flight: Break out job removal machinery Ian Jackson
2015-09-18 9:31 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 24/33] cs-adjust-flight: Provide `jobs-del' operation Ian Jackson
2015-09-18 9:31 ` Ian Campbell
2015-09-18 11:13 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 25/33] New utility mg-adjust-flight-makexrefs Ian Jackson
2015-09-18 9:47 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 26/33] make-flight: Contemplate varying architecture for Debian HVM Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 27/33] make-flight: Run job_create_test_filter_callback on true job name Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 28/33] make-flight: mfi-common: Honour $global_runvars Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 29/33] make-flight: Provide xen-unstable-smoke branch Ian Jackson
2015-09-18 9:50 ` Ian Campbell
2015-09-18 11:18 ` Ian Jackson
2015-09-18 11:23 ` Ian Campbell
2015-09-17 17:37 ` [OSSTEST PATCH 30/33] cr-daily-branch: Use mg-adjust-flight to have smoke tests reuse builds Ian Jackson
2015-09-18 9:52 ` Ian Campbell
2015-09-18 11:19 ` Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 31/33] cri-common: Support xen-unstable-smoke Ian Jackson
2015-09-17 17:37 ` [OSSTEST PATCH 32/33] ap-*: Be able to fetch and push xen.git#smoke Ian Jackson
2015-09-17 17:38 ` [OSSTEST PATCH 33/33] crontab: Enable xen-unstable-smoke branch every 3h at <1mod3>:51 UTC Ian Jackson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).