ap-fetch-version: Arrange for osstest merges from upstream to be stable

If a downstream osstest instance has nothing to test it its local
pretest then it will attempt to merge from the upstream instance. If
this fails then it will try again and again generating a new merge
commit each time, even if upstream has not moved.

It is desirable that these merges instead be stable i.e. the same if
the inputs have not changed. This is good for potential bisection
attempts, history reporting/mining as well as just being sensible.

Here we arrange for this by recording the last merge "epoch" (being
the first merge of the current input branches) in a new branch
"merge-epoch" in the local testing.git and comparing our fresh merge
against it.

If the tree and parents are the same then the merge is effectively
identical (it may/will differ in the date) and we reuse the epoch
merge.

If they new merge does not match then something has changed (i.e.
upstream has moved on) and so we take the new merge and establish a
new epoch.

Add a couple of ">&2" to some fetches to prevent anything other than
the desired SHA1 leaking onto stdout.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/ap-fetch-version b/ap-fetch-version
index ec52889a0cb644dcf269f9ac684dab8771df6358..8b41acfafc67f66e06ea91076db47329b60a68cf 100755 (executable)
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -103,8 +103,8 @@ osstest)
            # upstream. Whether or not there is anything in local
            # pretest is determined by using "git merge base"
 
-           git fetch $HOME/testing.git +production:production
-           git fetch $HOME/testing.git +pretest:pretest
+           git fetch $HOME/testing.git +production:production >&2
+           git fetch $HOME/testing.git +pretest:pretest >&2
 
            local_production=$(git rev-parse production^0)
            local_pretest=$(git rev-parse pretest^0)
@@ -134,12 +134,42 @@ osstest)
                    git merge \
                        -m "Automerge of $TREEBRANCH_OSSTEST_UPSTREAM into production" \
                        ap-merge >&2
+                   merge=$(git log -n1 --pretty='%T %P' HEAD)
+
+                   if git fetch $HOME/testing.git +merge-epoch:merge-epoch >&2 ; then
+                       # If the new merge matches the current epoch's
+                       # tree (%T) and parents (%P) then it is the
+                       # same in all the ways which matter. (It
+                       # likely only differs in the date). In which
+                       # case reuse the epoch merge so that repeated
+                       # flights and potential bisections over
+                       # osstest see something stable.
+                       #
+                       # If e.g the parents have changed
+                       # (e.g. upstream has progressed) or the trees
+                       # differ then use the new merge and establish
+                       # a new merge-epoch.
+                       epoch=$(git log -n1 --pretty='%T %P' merge-epoch)
+                   else
+                       echo >&2 "Failed to fetch merge-epoch"
+                       epoch="NONE"
+                   fi
+
+                   echo >&2 "Merge Epoch: $epoch"
+                   echo >&2 "This Merge:  $merge"
+                   if [ x"$epoch" = x"$merge" ] ; then
+                       echo >&2 "Reusing existing merge-epoch"
+                       git reset --hard merge-epoch >&2
+                   else
+                       echo >&2 "New merge-epoch"
+                       git push $HOME/testing.git +production:merge-epoch >&2
+                   fi
                )
 
                # Fetch the result of the above merge into local tree
                # ready for use. cr-daily-branch handles reseting the
                # working tree to this version
-               git fetch $repos/osstest-merge +production:ap-fetch
+               git fetch $repos/osstest-merge +production:ap-fetch >&2
            elif [ x$merge_base = x$local_production ] ; then
                # there are commits in pretest which we should test in
                # an attempt to progress production to this point.