[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 15/24] gitlab: Use plain docker in container-template.yml
From: |
Alex Bennée |
Subject: |
[PATCH v3 15/24] gitlab: Use plain docker in container-template.yml |
Date: |
Tue, 28 Feb 2023 19:06:44 +0000 |
From: Fabiano Rosas <farosas@suse.de>
Our dockerfiles no longer reference layers from other qemu images so
we can now use 'docker build' on them.
Also reinstate the caching that was disabled due to bad interactions
with certain runners. See commit 6ddc3dc7a8 ("tests/docker: don't use
BUILDKIT in GitLab either"). We now believe those issues to be fixed.
The COMMON_TAG needed to be fixed for the caching to work. The
docker.py script was not using the variable, but constructing the
correct URL directly.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Tested-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230227151110.31455-2-farosas@suse.de>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.gitlab-ci.d/container-template.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.d/container-template.yml
b/.gitlab-ci.d/container-template.yml
index c434b9c8f3..519b8a9482 100644
--- a/.gitlab-ci.d/container-template.yml
+++ b/.gitlab-ci.d/container-template.yml
@@ -6,17 +6,16 @@
- docker:dind
before_script:
- export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
- - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest"
+ - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest"
- apk add python3
- docker info
- docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p
"$CI_REGISTRY_PASSWORD"
script:
- echo "TAG:$TAG"
- echo "COMMON_TAG:$COMMON_TAG"
- - ./tests/docker/docker.py --engine docker build
- -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker"
- -r $CI_REGISTRY/qemu-project/qemu
- - docker tag "qemu/$NAME" "$TAG"
+ - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_TAG"
+ --build-arg BUILDKIT_INLINE_CACHE=1
+ -f "tests/docker/dockerfiles/$NAME.docker" "."
- docker push "$TAG"
after_script:
- docker logout
--
2.39.2
- Re: [PATCH v3 07/24] tests: don't run benchmarks for the tsan build, (continued)
- [PATCH v3 02/24] tests: add socat dependency for tests, Alex Bennée, 2023/02/28
- [PATCH v3 03/24] tests: be a bit more strict cleaning up fifos, Alex Bennée, 2023/02/28
- [PATCH v3 06/24] gitlab: extend custom runners with base_job_template, Alex Bennée, 2023/02/28
- [PATCH v3 12/24] tests: ensure we export job results for some cross builds, Alex Bennée, 2023/02/28
- [PATCH v3 11/24] tests/docker: Use binaries for debian-tricore-cross, Alex Bennée, 2023/02/28
- [PATCH v3 14/24] tests/dockerfiles: unify debian-toolchain references, Alex Bennée, 2023/02/28
- [PATCH v3 19/24] tests/docker: add USER stanzas to non-lci images, Alex Bennée, 2023/02/28
- [PATCH v3 10/24] tests: add tuxrun baseline test to avocado, Alex Bennée, 2023/02/28
- [PATCH v3 09/24] tests: skip the nios2 replay_kernel test, Alex Bennée, 2023/02/28
- [PATCH v3 15/24] gitlab: Use plain docker in container-template.yml,
Alex Bennée <=
- [PATCH v3 13/24] cirrus.yml: Improve the windows_msys2_task, Alex Bennée, 2023/02/28
- [PATCH v3 20/24] tests/docker: use direct RUNC call to build containers, Alex Bennée, 2023/02/28
- [PATCH v3 21/24] tests/docker: use direct RUNC call to run test jobs, Alex Bennée, 2023/02/28
- [PATCH v3 24/24] tests/avocado: disable BootLinuxPPC64 test in CI, Alex Bennée, 2023/02/28
- [PATCH v3 23/24] tests/docker: add zstdtools to the images (!AWAITING UPSTREAM), Alex Bennée, 2023/02/28
- [PATCH v3 18/24] tests/lcitool: append user setting stanza to dockerfiles, Alex Bennée, 2023/02/28
- [PATCH v3 17/24] configure: expose the direct container command, Alex Bennée, 2023/02/28
- [PATCH v3 22/24] gitlab: move the majority of artefact handling to a template, Alex Bennée, 2023/02/28