Re: [PATCH-for-6.0.1 0/2] gitlab-ci: Only push docker images to mainstream registry from /master
On Wed, Oct 27, 2021 at 12:09:39PM +0200, Philippe Mathieu-Daudé wrote: > +Richard/Peter > > On 10/27/21 10:49, Daniel P. Berrangé wrote: > > On Wed, Oct 27, 2021 at 07:26:54AM +0200, Philippe Mathieu-Daudé wrote: > >> Hi Michael, > >> > >> 2 more patches to avoid gitlab-ci mayhem when you push the > >> stable tags. See this cover for more info: > >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.mail-archive.com%2Fqemu-devel%40nongnu.org%2Fmsg846861.html&data=04%7C01%7Cmichael.roth%40amd.com%7C3c19b44a450a4db8aa1c08d99931e741%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637709261892671750%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=kPrWrqTCJSgz%2FLoCfYNDyIb6zqXY%2Fl8v1p4IgUg5psM%3D&reserved=0 > > > > Please don't push this to stable - Thomas points out that it is broken > > when any changes to dockerfiles are made. > > But we still don't want to update the registry with these old > images... > > What is the plan then, hold the stable tag until we figure out > the best fix? > > Otherwise Michael can use 'git-push --push-option=ci.skip' to > not trigger a CI pipeline when pushing stable tags (running > CI pipelines previously in his own gitlab namespace). I can take this approach for now. Thanks everyone for all the debugging/suggestions. -Mike > > >> Based-on: <20211019140944.152419-1-michael.r...@amd.com> > >> "Patch Round-up for stable 6.0.1, freeze on 2021-10-26" > >> > >> Daniel P. Berrangé (1): > >> gitlab: only let pages be published from default branch > >> > >> Philippe Mathieu-Daudé (1): > >> gitlab-ci: Only push docker images to registry from /master branch > >> > >> .gitlab-ci.d/containers.yml | 11 ++- > >> .gitlab-ci.d/edk2.yml | 11 ++- > >> .gitlab-ci.d/opensbi.yml| 11 ++- > >> .gitlab-ci.yml | 18 ++ > >> 4 files changed, 48 insertions(+), 3 deletions(-) > >> > >> -- > >> 2.31.1 > >> > >> > >> > > > > Regards, > > Daniel > > >
Re: [PATCH-for-6.0.1 0/2] gitlab-ci: Only push docker images to mainstream registry from /master
On Wed, Oct 27, 2021 at 12:09:39PM +0200, Philippe Mathieu-Daudé wrote: > +Richard/Peter > > On 10/27/21 10:49, Daniel P. Berrangé wrote: > > On Wed, Oct 27, 2021 at 07:26:54AM +0200, Philippe Mathieu-Daudé wrote: > >> Hi Michael, > >> > >> 2 more patches to avoid gitlab-ci mayhem when you push the > >> stable tags. See this cover for more info: > >> https://www.mail-archive.com/qemu-devel@nongnu.org/msg846861.html > > > > Please don't push this to stable - Thomas points out that it is broken > > when any changes to dockerfiles are made. > > But we still don't want to update the registry with these old > images... > > What is the plan then, hold the stable tag until we figure out > the best fix? > > Otherwise Michael can use 'git-push --push-option=ci.skip' to > not trigger a CI pipeline when pushing stable tags (running > CI pipelines previously in his own gitlab namespace). Yes, I'd suggest that approach currently, until we figure out a real long term solution. Regards, Daniel -- |: https://berrange.com -o-https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o-https://fstop138.berrange.com :| |: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|
Re: [PATCH-for-6.0.1 0/2] gitlab-ci: Only push docker images to mainstream registry from /master
+Richard/Peter On 10/27/21 10:49, Daniel P. Berrangé wrote: > On Wed, Oct 27, 2021 at 07:26:54AM +0200, Philippe Mathieu-Daudé wrote: >> Hi Michael, >> >> 2 more patches to avoid gitlab-ci mayhem when you push the >> stable tags. See this cover for more info: >> https://www.mail-archive.com/qemu-devel@nongnu.org/msg846861.html > > Please don't push this to stable - Thomas points out that it is broken > when any changes to dockerfiles are made. But we still don't want to update the registry with these old images... What is the plan then, hold the stable tag until we figure out the best fix? Otherwise Michael can use 'git-push --push-option=ci.skip' to not trigger a CI pipeline when pushing stable tags (running CI pipelines previously in his own gitlab namespace). >> Based-on: <20211019140944.152419-1-michael.r...@amd.com> >> "Patch Round-up for stable 6.0.1, freeze on 2021-10-26" >> >> Daniel P. Berrangé (1): >> gitlab: only let pages be published from default branch >> >> Philippe Mathieu-Daudé (1): >> gitlab-ci: Only push docker images to registry from /master branch >> >> .gitlab-ci.d/containers.yml | 11 ++- >> .gitlab-ci.d/edk2.yml | 11 ++- >> .gitlab-ci.d/opensbi.yml| 11 ++- >> .gitlab-ci.yml | 18 ++ >> 4 files changed, 48 insertions(+), 3 deletions(-) >> >> -- >> 2.31.1 >> >> >> > > Regards, > Daniel >
Re: [PATCH-for-6.0.1 0/2] gitlab-ci: Only push docker images to mainstream registry from /master
On Wed, Oct 27, 2021 at 07:26:54AM +0200, Philippe Mathieu-Daudé wrote: > Hi Michael, > > 2 more patches to avoid gitlab-ci mayhem when you push the > stable tags. See this cover for more info: > https://www.mail-archive.com/qemu-devel@nongnu.org/msg846861.html Please don't push this to stable - Thomas points out that it is broken when any changes to dockerfiles are made. > > Based-on: <20211019140944.152419-1-michael.r...@amd.com> > "Patch Round-up for stable 6.0.1, freeze on 2021-10-26" > > Daniel P. Berrangé (1): > gitlab: only let pages be published from default branch > > Philippe Mathieu-Daudé (1): > gitlab-ci: Only push docker images to registry from /master branch > > .gitlab-ci.d/containers.yml | 11 ++- > .gitlab-ci.d/edk2.yml | 11 ++- > .gitlab-ci.d/opensbi.yml| 11 ++- > .gitlab-ci.yml | 18 ++ > 4 files changed, 48 insertions(+), 3 deletions(-) > > -- > 2.31.1 > > > Regards, Daniel -- |: https://berrange.com -o-https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o-https://fstop138.berrange.com :| |: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|
[PATCH-for-6.0.1 0/2] gitlab-ci: Only push docker images to mainstream registry from /master
Hi Michael, 2 more patches to avoid gitlab-ci mayhem when you push the stable tags. See this cover for more info: https://www.mail-archive.com/qemu-devel@nongnu.org/msg846861.html Based-on: <20211019140944.152419-1-michael.r...@amd.com> "Patch Round-up for stable 6.0.1, freeze on 2021-10-26" Daniel P. Berrangé (1): gitlab: only let pages be published from default branch Philippe Mathieu-Daudé (1): gitlab-ci: Only push docker images to registry from /master branch .gitlab-ci.d/containers.yml | 11 ++- .gitlab-ci.d/edk2.yml | 11 ++- .gitlab-ci.d/opensbi.yml| 11 ++- .gitlab-ci.yml | 18 ++ 4 files changed, 48 insertions(+), 3 deletions(-) -- 2.31.1
