Re: [PATCH 1/5] gitlab: centralize the container tag name

[Thomas Huth <thuth@redhat.com>]

On 26/05/2023 12.20, Daniel P. Berrangé wrote:
> On Fri, May 26, 2023 at 09:25:39AM +0200, Thomas Huth wrote:
>> On 17/05/2023 15.54, Daniel P. Berrangé wrote:
>>> We use a fixed container tag of 'latest' so that contributors' forks
>>> don't end up with an ever growing number of containers as they work
>>> on throwaway feature branches.
>>>
>>> This fixed tag causes problems running CI upstream in stable staging
>>> branches, however, because the stable staging branch will publish old
>>> container content that clashes with that needed by primary staging
>>> branch. This makes it impossible to reliably run CI pipelines in
>>> parallel in upstream for different staging branches.
>>>
>>> This introduces $QEMU_CI_CONTAINER_TAG global variable as a way to
>>> change which tag container publishing uses. Initially it can be set
>>> by contributors as a git push option if they want to override the
>>> default use of 'latest' eg
>>>
>>>     git push gitlab <branch> -o ci.variable=QEMU_CONTAINER_TAG=fish
>>>
>>> this is useful if contributors need to run pipelines for different
>>> branches concurrently in their forks.
> 
>>
>> This patch no longer applies ... could you please rebase and resend a v2?
>> Thanks!
> 
> I've rebased and sent a v2, but I didn't get any conflits when
> rebasing, so v1 should have applied OK.

git-am is sometimes more picky than git-rebase ... I think there were some 
contextual conflicts with the patches from Camilla (commit 5f63a67adb5847 
and b105ce60ca8bdee3) ... I should have maybe tried with "--3way" first 
before complaining, sorry.

  Thomas