* [PATCH] gitlab-ci/containers: Add missing wildcard where we should look for changes
@ 2020-07-13 18:22 Thomas Huth
2020-07-13 20:05 ` Alex Bennée
2020-07-13 20:19 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Huth @ 2020-07-13 18:22 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] gitlab-ci/containers: Add missing wildcard where we should look for changes
2020-07-13 18:22 [PATCH] gitlab-ci/containers: Add missing wildcard where we should look for changes Thomas Huth
@ 2020-07-13 20:05 ` Alex Bennée
2020-07-13 20:19 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Alex Bennée @ 2020-07-13 20:05 UTC (permalink / raw)
To: Thomas Huth
Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé, qemu-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gitlab-ci/containers: Add missing wildcard where we should look for changes
2020-07-13 18:22 [PATCH] gitlab-ci/containers: Add missing wildcard where we should look for changes Thomas Huth
2020-07-13 20:05 ` Alex Bennée
@ 2020-07-13 20:19 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-07-13 20:19 UTC (permalink / raw)
To: Thomas Huth, Alex Bennée, qemu-devel; +Cc: Daniel P. Berrangé
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"'
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-13 20:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-13 18:22 [PATCH] gitlab-ci/containers: Add missing wildcard where we should look for changes Thomas Huth
2020-07-13 20:05 ` Alex Bennée
2020-07-13 20:19 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).