Re: Sorting out osstest

[Anthony PERARD <anthony.perard@xxxxxxxxxx>]

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@xxxxxxxxxx/
> 
> 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