Skip to contentSkip to conversation

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

PATCH Applied Thomas Huth 3 participants 3 messages Jul 13, 2020

lore
Share & tools
lore
#0 lore raw

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

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.

---
 .gitlab-ci.d/containers.yml | 1 +
 1 file changed, 1 insertion(+)
.gitlab-ci.d/containers.yml +1 -0
index f3c0ca4d61..8c89efeb6d 100644
@@ -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"'
 
Signature · 1 line
2.18.1
Applied
#1 lore raw
Quoted 8 lines · Thomas Huth

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.

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

Signature · 1 line
Alex Bennée
Reviewed-by on v1 1/1
#2 lore raw
In reply to Thomas Huth
Quoted 17 lines · Thomas Huth

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.

---
 .gitlab-ci.d/containers.yml | 1 +
 1 file changed, 1 insertion(+)
.gitlab-ci.d/containers.yml +0 -0
index f3c0ca4d61..8c89efeb6d 100644

.gitlab-ci.d/containers.yml line 26

Quoted 3 lines
.gitlab-ci.d/containers.yml +0 -0
@@ -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,

Quoted 5 lines
.gitlab-ci.d/containers.yml +1 -0
+      - tests/docker/dockerfiles/*
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
     - if: '$CI_COMMIT_REF_NAME == "testing/next"'