diff mbox series

[PULL,35/41] gitlab: limit re-builds of the containers

Message ID	20200707070858.6622-36-alex.bennee@linaro.org
State	Accepted
Commit	f2c5466c78da786dbf6506e3a15b856b7427708e
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Subject: [PULL 35/41] gitlab: limit re-builds of the containers Date: Tue, 7 Jul 2020 08:08:52 +0100 Message-Id: <20200707070858.6622-36-alex.bennee@linaro.org> In-Reply-To: <20200707070858.6622-1-alex.bennee@linaro.org> References: <20200707070858.6622-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com Precedence: list Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	testing updates (vm, gitlab, misc build fixes) \| expand [PULL,00/41] testing updates (vm, gitlab, misc build fixes) [PULL,01/41] crypto/linux_keyring: fix 'secret_keyring' configure test [PULL,02/41] util/coroutine: Cleanup start_switch_fiber_ for TSAN. [PULL,03/41] tests/vm: pass args through to BaseVM's __init__ [PULL,04/41] tests/vm: Add configuration to basevm.py [PULL,05/41] tests/vm: Added configuration file support [PULL,06/41] tests/vm: Add common Ubuntu python module [PULL,07/41] tests/vm: Added a new script for ubuntu.aarch64. [PULL,08/41] tests/vm: Added a new script for centos.aarch64. [PULL,09/41] tests/vm: change scripts to use self._config [PULL,10/41] python/qemu: Add ConsoleSocket for optional use in QEMUMachine [PULL,11/41] tests/vm: Add workaround to consume console [PULL,12/41] tests/vm: switch from optsparse to argparse [PULL,13/41] tests/vm: allow us to take advantage of MTTCG [PULL,14/41] tests/docker: check for an parameters not empty string [PULL,15/41] tests/docker: change tag naming scheme of our images [PULL,16/41] .gitignore: un-ignore .gitlab-ci.d [PULL,17/41] gitlab-ci: Fix the change rules after moving the YML files [PULL,18/41] gitlab: introduce explicit "container" and "build" stages [PULL,19/41] gitlab: build all container images during CI [PULL,20/41] gitlab: convert jobs to use custom built containers [PULL,21/41] gitlab: build containers with buildkit and metadata [PULL,22/41] tests/docker: add --registry support to tooling [PULL,23/41] tests/docker: add packages needed for check-acceptance [PULL,24/41] tests/acceptance: skip s390x_ccw_vrtio_tcg on GitLab [PULL,25/41] tests/acceptance: fix dtb path for machine_rx_gdbsim [PULL,26/41] tests/acceptance: skip multicore mips_malta tests on GitLab [PULL,27/41] tests/acceptance: skip LinuxInitrd 2gib with v4.16 on GitLab [PULL,28/41] gitlab: add acceptance testing to system builds [PULL,29/41] tests/tcg: add more default compilers to configure.sh [PULL,30/41] tests/docker: add a linux-user testing focused image [PULL,31/41] linux-user/elfload: use MAP_FIXED_NOREPLACE in pgb_reserved_va [PULL,32/41] gitlab: enable check-tcg for linux-user tests [PULL,33/41] gitlab: add avocado asset caching [PULL,34/41] gitlab: split build-disabled into two phases [PULL,35/41] gitlab: limit re-builds of the containers [PULL,36/41] containers.yml: build with docker.py tooling [PULL,37/41] testing: add check-build target [PULL,38/41] shippable: pull images from registry instead of building [PULL,39/41] travis.yml: Test also the other targets on s390x [PULL,40/41] tests/qht-bench: Adjust testing rate by -1 [PULL,41/41] tests/qht-bench: Adjust threshold computation

Commit Message

Alex Bennée July 7, 2020, 7:08 a.m. UTC

Most of the time we are just rebuilding the same things. We can skip
this although currently there is no mechanism for picking up new
distro releases.

Rather than try to be too fine grained allow any change to trigger all
the images being rebuilt.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>


Message-Id: <20200701135652.1366-38-alex.bennee@linaro.org>

-- 
2.20.1

diff mbox series

Patch

diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index a7621c4204c7..ea350eacff70 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -17,6 +17,12 @@ 
     - docker push "$TAG"
   after_script:
     - docker logout
+  rules:
+    - changes:
+      - .gitlab-ci.d/containers.yml
+      - tests/docker/*
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_REF_NAME == "testing/next"'
 
 amd64-centos7-container:
   <<: *container_job_definition