ap-fetch-*: Support $AP_FETCH_PLACEHOLDERS envvar which outputs a placeholder

And use this in standalone-generate-dump-flight-runvars. In general I
don't think we are interested in the specific revision_* runvars when
using this tool but when it matters this new behaviour can be avoided
by setting AP_FETCH_PLACEHOLDERS=n.

This is quicker even than using memoisation on the ap-fetch
invocations and produces output like:

libvirt  build-amd64  revision_xen  ap-fetch-version-baseline:xen-unstable

This is useful when doing comparisons of before and after changes to
e.g. make-flight since they do not pickup noise if a something/someone
does a push in the middle.

The memoisation bits of standalone-generate-dump-flight-runvars are
disabled if AP_FETCH_PLACEHOLDERS=y.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ap-common b/ap-common
index 91425a956b128b09fdccc07828e17809ce9c5b39..5b6e088f513021c5bd276a18d484cc626ff19cf5 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -145,3 +145,12 @@ info_linux_tree () {
 
        return 0
 }
+
+check_ap_fetch_placeholders () {
+       if [ "x$AP_FETCH_PLACEHOLDERS" != xy ] ; then
+               return 0
+       fi
+
+       echo "$(basename $0):$branch"
+       exit 0
+}

diff --git a/ap-fetch-version b/ap-fetch-version
index 6fa75880f9852159f7f695c743689a27071d6186..f884bd37f7651d3664a6490e4ea264c7f05408de 100755 (executable)
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -25,6 +25,8 @@ branch=$1
 select_xenbranch
 . ./ap-common
 
+check_ap_fetch_placeholders
+
 if info_linux_tree "$branch"; then
        repo_tree_rev_fetch_git linux \
                $TREE_LINUX_THIS $TAG_LINUX_THIS $LOCALREV_LINUX

diff --git a/ap-fetch-version-baseline b/ap-fetch-version-baseline
index 2e42508e7e19f5d1d3f87e5ac4e42f8a67b23520..c9da82ce77df411766e7e2280fabd0a63dbe6728 100755 (executable)
--- a/ap-fetch-version-baseline
+++ b/ap-fetch-version-baseline
@@ -22,6 +22,9 @@ set -e -o posix
 branch=$1
 
 . ./cri-lock-repos
+. ./ap-common
+
+check_ap_fetch_placeholders
 
 : ${BASE_TREE_LINUX:=git://xenbits.xen.org/people/ianc/linux-2.6.git}
 : ${BASE_TAG_LINUX:=xen/next-2.6.32}

diff --git a/ap-fetch-version-baseline-late b/ap-fetch-version-baseline-late
index 9856ec9337a7515ac89c3ff33189fd486bc9bcbe..dff8b05bbf28b6b8edfed6bceb6f4a9854db216b 100755 (executable)
--- a/ap-fetch-version-baseline-late
+++ b/ap-fetch-version-baseline-late
@@ -27,6 +27,8 @@ new=$2
 select_xenbranch
 . ./ap-common
 
+check_ap_fetch_placeholders
+
 case "$branch" in
 
 linux-next)

diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 66d51f8793d6f6d8860f055c74863a69d06f72d1..99f276a48c1cefbe74f9f3f333111c203a5d84ff 100755 (executable)
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -25,6 +25,8 @@ branch=$1
 select_xenbranch
 . ./ap-common
 
+check_ap_fetch_placeholders
+
 : ${BASE_TAG_LINUX2639:=tested/2.6.39.x}
 : ${BASE_LOCALREV_LINUX:=daily-cron.$branch.old}
 : ${BASE_LOCALREV_LIBVIRT:=daily-cron.$branch.old}

diff --git a/standalone-generate-dump-flight-runvars b/standalone-generate-dump-flight-runvars
index 4217719f3d168c5b34fff83224f784efd38c2427..e91026af52287d023f58af08eeb26390d8f731bb 100755 (executable)
--- a/standalone-generate-dump-flight-runvars
+++ b/standalone-generate-dump-flight-runvars
@@ -36,11 +36,17 @@ if [ $# = 0 ]; then
    set `./mg-list-all-branches`
 fi
 
-if [ "x$AP_FETCH_MEMO_KEEP" = x ]; then
+: ${AP_FETCH_PLACEHOLDERS:=y}
+export AP_FETCH_PLACEHOLDERS
+
+
+if [ "x$AP_FETCH_PLACEHOLDERS" != xy ]; then
+    if [ "x$AP_FETCH_MEMO_KEEP" = x ]; then
        rm -rf tmp/apmemo
        mkdir tmp/apmemo
+    fi
+    export AP_FETCH_PFX='./memoise 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.