[OSSTEST PATCH 1/4] standalone: Fix spurious ]

[OSSTEST PATCH 1/4] standalone: Fix spurious ]

[Ian Jackson]

This looks like this was once a call to test(1).  ssh-add, as it
happens, seems to ignore this spuriuous `]' (!) so there isn't any
significant change.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 standalone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/standalone b/standalone
index 977ad50c..b51acf7b 100755
--- a/standalone
+++ b/standalone
@@ -136,7 +136,7 @@ if [ ! -r "$WebspaceLog" ] ; then
     echo "WARNING: Cannot read apache logs at $WebspaceLog. Some tests may fail" >&2
 fi
 
-if ! ssh-add -l >/dev/null ] ; then
+if ! ssh-add -l >/dev/null ; then
     echo "WARNING: Unable to access ssh-agent. Some tests may fail" >&2
 fi
 
-- 
2.20.1

[OSSTEST PATCH 2/4] standalone-generate-dump-flight-runvars: mkdir -p logs

[Ian Jackson]

Otherwise if logs doesn't exist, the code in `standalone' which is
eventually called to build each flight will try to do it - but that
code is not idempotent in the presence of other racing copies of
itself.

Rather than trusting mkdir -p there, do it here.

No change other than to this dev-debugging script.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 standalone-generate-dump-flight-runvars | 1 +
 1 file changed, 1 insertion(+)

diff --git a/standalone-generate-dump-flight-runvars b/standalone-generate-dump-flight-runvars
index 3b893623..5c93b0af 100755
--- a/standalone-generate-dump-flight-runvars
+++ b/standalone-generate-dump-flight-runvars
@@ -53,6 +53,7 @@ if [ "x$AP_FETCH_PLACEHOLDERS" != xy ]; then
 	mkdir tmp/apmemo
     fi
     export AP_FETCH_PFX='./memoise tmp/apmemo'
+    mkdir -p logs
 fi
 
 # In the future it might be nice for this script to arrange to use a
-- 
2.20.1

[OSSTEST PATCH 3/4] standalone: Do not complain about ssh if AP_FETCH_PLACEHOLDERS=y

[Ian Jackson]

In this case, there is no need to ssh anywhere.

No change other than in dev-debugging setups.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 standalone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/standalone b/standalone
index b51acf7b..9553d6c9 100755
--- a/standalone
+++ b/standalone
@@ -136,7 +136,7 @@ if [ ! -r "$WebspaceLog" ] ; then
     echo "WARNING: Cannot read apache logs at $WebspaceLog. Some tests may fail" >&2
 fi
 
-if ! ssh-add -l >/dev/null ; then
+if [ "x$AP_FETCH_PLACEHOLDERS" != x ] && ! ssh-add -l >/dev/null ; then
     echo "WARNING: Unable to access ssh-agent. Some tests may fail" >&2
 fi
 
-- 
2.20.1

[OSSTEST PATCH 4/4] make-flight: Test Xen 4.9 and Xen 4.10 on stretch

[Ian Jackson]

Xen 4.9 doesn't build on buster and won't be fixed for that.
Xen 4.10's "-prev" migration tests also fail for the same reason.

There is a (smallish) risk that Debian will break stretch before Xen
4.10 goes completely out of support from the Xen Project.  If that
happens we could revert this - but then the 4.10 -prev jobs will stop
building.

Xen 4.9 is nearly out of security support, so for the 4.9 tests this
is a no-brainer.

I have checked the runvar diff.  The results are to change
  all_host_di_version [*]
  all_host_suite
  all_hostflags
  debian_suite
  debianhvm_suite
  host_hostflags
in many jobs in
  qemu-upstream-4.9-testing
  qemu-upstream-4.10-testing
  xen-4.9-testing
  xen-4.10-testing
[*] this is not visible in standalone-generate-dump-flight-runvars
because it always just uses `current'.

This command produces no output:
   diff -ub a <(perl -pe 's/stretch/buster/g' c)
(where `a' is before and `c' is after.)

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 make-flight | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/make-flight b/make-flight
index a361bcb1..836bc31c 100755
--- a/make-flight
+++ b/make-flight
@@ -41,6 +41,8 @@ case "$xenbranch" in
   xen-4.1-testing) defsuite="wheezy"; defguestsuite="wheezy";;
   xen-4.2-testing) defsuite="wheezy"; defguestsuite="wheezy";;
   xen-4.3-testing) defsuite="wheezy"; defguestsuite="wheezy";;
+  xen-4.9-testing)  defsuite="stretch"; defguestsuite="stretch";;
+  xen-4.10-testing) defsuite="stretch"; defguestsuite="stretch";;
   *)
     defsuite=`getconfig DebianSuite`
     defguestsuite=`getconfig GuestDebianSuite`
-- 
2.20.1