[GIT-PULL OSSTEST] ap-fetch-version: Arrange for osstest merges from upstream to be stable

[GIT-PULL OSSTEST] ap-fetch-version: Arrange for osstest merges from upstream to be stable

[Ian Campbell]

"ap-fetch-version: Arrange for osstest merges from upstream to be
stable" has now passed the Cambridge push gate and done a couple of
merges from upstream as well as some failed attempts, which behaved as
expected. I've dropped a stop file in Cambridge while this pull request
is pending, so we don't end up racing.

The following changes since commit 11e788f7b180ff7e693f7342617318ff01c961c5:

  JobDB/Executive: Improve an internal `die' error (2015-07-09 12:47:38 +0100)

are available in the git repository at:

  git://xenbits.xen.org/people/ianc/osstest.git from-cambridge/2015-07-13

for you to fetch changes up to 43b59cba103da97fd15ab63f570706a1b149970f:

  Automerge of git://xenbits.xen.org/osstest.git master into production (2015-07-11 08:35:43 +0100)

----------------------------------------------------------------
Ian Campbell (1):
      ap-fetch-version: Arrange for osstest merges from upstream to be stable

xen.org (2):
      Automerge of git://xenbits.xen.org/osstest.git master into production
      Automerge of git://xenbits.xen.org/osstest.git master into production

 ap-fetch-version | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

Re: [GIT-PULL OSSTEST] ap-fetch-version: Arrange for osstest merges from upstream to be stable

[Ian Jackson]

Ian Campbell writes ("[GIT-PULL OSSTEST] ap-fetch-version: Arrange for osstest merges from upstream to be stable"):
> "ap-fetch-version: Arrange for osstest merges from upstream to be
> stable" has now passed the Cambridge push gate and done a couple of
> merges from upstream as well as some failed attempts, which behaved as
> expected. I've dropped a stop file in Cambridge while this pull request
> is pending, so we don't end up racing.

I have merged, and pushed this to pretest in the colo.

Let us avoid pushing anything else to pretest for a bit, so that we
can contain the history mess.

Thanks,
Ian.

Re: [GIT-PULL OSSTEST] ap-fetch-version: Arrange for osstest merges from upstream to be stable

[Ian Campbell]

On Mon, 2015-07-13 at 18:03 +0100, Ian Jackson wrote:
> Ian Campbell writes ("[GIT-PULL OSSTEST] ap-fetch-version: Arrange for osstest merges from upstream to be stable"):
> > "ap-fetch-version: Arrange for osstest merges from upstream to be
> > stable" has now passed the Cambridge push gate and done a couple of
> > merges from upstream as well as some failed attempts, which behaved as
> > expected. I've dropped a stop file in Cambridge while this pull request
> > is pending, so we don't end up racing.
> 
> I have merged, and pushed this to pretest in the colo.

Thanks.

> Let us avoid pushing anything else to pretest for a bit, so that we
> can contain the history mess.

The Cambridge instance is currently stopped. I won't unstop it until
this merge passes mainline pretest, at which point further merges into
Cambridge should be fast forwarding again.

Ian.