[for-4.18] CI: (More) Always pull base image when building a container

Commit Message

Andrew Cooper Oct. 19, 2023, 5:14 p.m. UTC

Repeat c/s 26ecc08b98fc ("automation: Always pull base image when building a
container") for the other makefile we've got building containers.

Signed-off-by: Andrew Cooper <[e-mail]>
---
CC: Anthony PERARD <[e-mail]>
CC: Stefano Stabellini <[e-mail]>
CC: Michal Orzel <[e-mail]>
CC: Doug Goldstein <[e-mail]>
CC: Henry Wang <[e-mail]>

For 4.18.  This is CI infrastructure, not part of the regular build.
---
 automation/tests-artifacts/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: 698b0f5031c6083401234a9b9415175cc5855a0a
prerequisite-patch-id: 94c86c1b3eb7aeda8eeef91241cdc8fa2691e2bc
prerequisite-patch-id: 728853399bfbaf972317a0d35ecd695f65026844
prerequisite-patch-id: 5a145a4decd44ace43a37b0315773e0abc6d54c6
prerequisite-patch-id: 24fad994d25558a45bbd3ead38120c154a974e9a
prerequisite-patch-id: a2a69b5382a293809a03633fd0513c371f9cf668

Comments

Anthony PERARD Oct. 19, 2023, 5:33 p.m. UTC | #1

On Thu, Oct 19, 2023 at 06:14:52PM +0100, Andrew Cooper wrote:
> Repeat c/s 26ecc08b98fc ("automation: Always pull base image when building a
> container") for the other makefile we've got building containers.
> 
> Signed-off-by: Andrew Cooper <[e-mail]>
> ---
> 
> For 4.18.  This is CI infrastructure, not part of the regular build.

Reviewed-by: Anthony PERARD <[e-mail]>

Thanks,

Stefano Stabellini Oct. 19, 2023, 7:43 p.m. UTC | #2

On Thu, 19 Oct 2023, Anthony PERARD wrote:
> On Thu, Oct 19, 2023 at 06:14:52PM +0100, Andrew Cooper wrote:
> > Repeat c/s 26ecc08b98fc ("automation: Always pull base image when building a
> > container") for the other makefile we've got building containers.
> > 
> > Signed-off-by: Andrew Cooper <[e-mail]>
> > ---
> > 
> > For 4.18.  This is CI infrastructure, not part of the regular build.
> 
> Reviewed-by: Anthony PERARD <[e-mail]>

Acked-by: Stefano Stabellini <[e-mail]>

Henry Wang Oct. 20, 2023, 1:09 a.m. UTC | #3

Hi all,

> On Oct 20, 2023, at 03:43, Stefano Stabellini <[e-mail]> wrote:
> 
> On Thu, 19 Oct 2023, Anthony PERARD wrote:
>> On Thu, Oct 19, 2023 at 06:14:52PM +0100, Andrew Cooper wrote:
>>> Repeat c/s 26ecc08b98fc ("automation: Always pull base image when building a
>>> container") for the other makefile we've got building containers.
>>> 
>>> Signed-off-by: Andrew Cooper <[e-mail]>
>>> ---
>>> 
>>> For 4.18.  This is CI infrastructure, not part of the regular build.
>> 
>> Reviewed-by: Anthony PERARD <[e-mail]>
> 
> Acked-by: Stefano Stabellini <[e-mail]>

Release-acked-by: Henry Wang <[e-mail]>

Kind regards,
Henry

Patch

diff --git a/automation/tests-artifacts/Makefile b/automation/tests-artifacts/Makefile
index 8ca71b78adbd..d055cd696bed 100644
--- a/automation/tests-artifacts/Makefile
+++ b/automation/tests-artifacts/Makefile
@@ -10,7 +10,7 @@  help:
 	@echo "To push container builds, set the env var PUSH"
 
 %: %.dockerfile ## Builds containers
-	docker build -t $(REGISTRY)/$(@D):$(@F) -f $< $(<D)
+	docker build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $(<D)
 	@if [ ! -z $${PUSH+x} ]; then \
 		docker push $(REGISTRY)/$(@D):$(@F); \
 	fi