From: Anthony PERARD <anthony.perard@citrix.com>
To: "Roger Pau Monné" <roger.pau@citrix.com>
Cc: <xen-devel@lists.xenproject.org>, Ian Jackson <iwj@xenproject.org>
Subject: Re: Sorting out osstest
Date: Thu, 15 Sep 2022 16:38:41 +0100 [thread overview]
Message-ID: <YyNHAUomrUHyyi+n@perard.uk.xensource.com> (raw)
In-Reply-To: <YyNDpi9vGiNE60v7@MacBook-Air-de-Roger.local>
On Thu, Sep 15, 2022 at 05:24:22PM +0200, Roger Pau Monné wrote:
> Hello,
>
> There was a bit of a mess with osstest, changes have been pushed
> directly into xenbits osstest.git#master. The same changes have also
> been pushed to testing.git#pretest (but it seems that with different
> hashes). Prestest however is not passing because of libvirt build
> issues.
>
> osstest.git#master:
>
> 8510c7df (origin/master, origin/HEAD) ts-libvirt-build: Rework to build with meson
> f9d084ab TestSupport: Add support for installing from backport repo
> b21b6e80 (testing/pretest) ts-xen-build-prep: Install newer NASM version, to build OVMF
> 2cffc6ec (testing/production, testing/master, refs/patches/fix_efi/debian-hvm-cd-update) osstest: update Debian Buster install CD media to 10.12
> dc762d67 osstest: install irqbalance
>
> testing.git#pretest:
>
> 12c254e (HEAD -> pretest) ts-libvirt-build: Rework to build with meson
> c2c2f5a TestSupport: Add support for installing from backport repo
> b21b6e8 (production, master) ts-xen-build-prep: Install newer NASM version, to build OVMF
> 2cffc6e osstest: update Debian Buster install CD media to 10.12
> dc762d6 osstest: install irqbalance
>
> My plan would be to pick osstest.git#master, add my libvirt fix on
> top of it:
>
> https://lore.kernel.org/xen-devel/20220913100328.27771-1-roger.pau@citrix.com/
>
> And then force push the result into testing.git#pretest in order to
> overwrite the current pretest branch and have it based on
> osstest.git#master.
>
> I would then expect the pretest flight to succeed and do a fast
> forward push into xenbits osstest.git#master.
>
> Let me know if that sounds like a suitable plan.
Yes, that plan sound good to me. Just one thing, `git checkout master`
in testing.git as at the moment "pretest" is the current branch.
Cheers,
--
Anthony PERARD
next prev parent reply other threads:[~2022-09-15 15:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 15:24 Sorting out osstest Roger Pau Monné
2022-09-15 15:38 ` Anthony PERARD [this message]
2022-09-16 0:11 ` osstest branch refs and self-push-gate " Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YyNHAUomrUHyyi+n@perard.uk.xensource.com \
--to=anthony.perard@citrix.com \
--cc=iwj@xenproject.org \
--cc=roger.pau@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.