gitlab-ci/containers: Add missing wildcard where we should look for changes

[PATCH] gitlab-ci/containers: Add missing wildcard where we should look for changes

Posted by Thomas Huth 5 years, 4 months ago

The tests/docker/* wildcard seems to only match the files that are directly
in the tests/docker folder - but changes to the files in the directory
tests/docker/dockerfiles are currently ignored. Seems like we need a
separate entry to match the files in that folder. With this wildcard added,
the stages now get re-run successfully when something in the dockerfiles
has been changed.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .gitlab-ci.d/containers.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index f3c0ca4d61..8c89efeb6d 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -24,6 +24,7 @@
     - changes:
       - .gitlab-ci.d/containers.yml
       - tests/docker/*
+      - tests/docker/dockerfiles/*
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
     - if: '$CI_COMMIT_REF_NAME == "testing/next"'
 
-- 
2.18.1

Re: [PATCH] gitlab-ci/containers: Add missing wildcard where we should look for changes

Posted by Philippe Mathieu-Daudé 5 years, 4 months ago

On 7/13/20 8:22 PM, Thomas Huth wrote:
> The tests/docker/* wildcard seems to only match the files that are directly
> in the tests/docker folder - but changes to the files in the directory
> tests/docker/dockerfiles are currently ignored. Seems like we need a
> separate entry to match the files in that folder. With this wildcard added,
> the stages now get re-run successfully when something in the dockerfiles
> has been changed.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  .gitlab-ci.d/containers.yml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
> index f3c0ca4d61..8c89efeb6d 100644
> --- a/.gitlab-ci.d/containers.yml
> +++ b/.gitlab-ci.d/containers.yml
> @@ -24,6 +24,7 @@
>      - changes:
>        - .gitlab-ci.d/containers.yml
>        - tests/docker/*

The test-* and common.rc are used outside, maybe we can
amend:

-        - tests/docker/*
+        - tests/docker/Makefile.include
+        - tests/docker/docker.py

Anyway,
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> +      - tests/docker/dockerfiles/*
>      - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
>      - if: '$CI_COMMIT_REF_NAME == "testing/next"'
>  
>

Re: [PATCH] gitlab-ci/containers: Add missing wildcard where we should look for changes

Posted by Alex Bennée 5 years, 4 months ago

Thomas Huth <thuth@redhat.com> writes:

> The tests/docker/* wildcard seems to only match the files that are directly
> in the tests/docker folder - but changes to the files in the directory
> tests/docker/dockerfiles are currently ignored. Seems like we need a
> separate entry to match the files in that folder. With this wildcard added,
> the stages now get re-run successfully when something in the dockerfiles
> has been changed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Queued to misc/for-5.1-rc0, thanks.

-- 
Alex Bennée