From 5ed6598c6b47f23e506f97c49c3ddc050e9b2dff Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Mon, 17 Jul 2023 15:10:54 +1000 Subject: [PATCH] Add $self to the list of files for python images. With the merging of [1] we observed that the images built (python-3.{9,10,11}-bookworm) were not then promoted. This was fixed in [2] as the assumption is that the promotion jobs didn't trigger because the files modified in [1] don't match the needed files. This change adds the zuul configuration file to the list of relevant files. We're not 100% sure that this will work but it's worth a try. [1] https://review.opendev.org/c/opendev/system-config/+/888102 [2] https://review.opendev.org/c/opendev/system-config/+/888633 Change-Id: I958a0af6fbad80f8152438aaee6b7268432f64d5 --- zuul.d/docker-images/python-3.10-bookworm.yaml | 3 +++ zuul.d/docker-images/python-3.10-bullseye.yaml | 3 +++ zuul.d/docker-images/python-3.11-bookworm.yaml | 3 +++ zuul.d/docker-images/python-3.11-bullseye.yaml | 3 +++ zuul.d/docker-images/python-3.9-bookworm.yaml | 3 +++ zuul.d/docker-images/python-3.9-bullseye.yaml | 3 +++ 6 files changed, 18 insertions(+) diff --git a/zuul.d/docker-images/python-3.10-bookworm.yaml b/zuul.d/docker-images/python-3.10-bookworm.yaml index 52bd5f28f4..157e301dc3 100644 --- a/zuul.d/docker-images/python-3.10-bookworm.yaml +++ b/zuul.d/docker-images/python-3.10-bookworm.yaml @@ -22,6 +22,7 @@ files: &python-builder_3_10_bookworm_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.10-bookworm.yaml - job: name: system-config-upload-image-python-builder-3.10-bookworm @@ -64,6 +65,7 @@ files: &python-base_3_10_bookworm_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.10-bookworm.yaml - job: name: system-config-upload-image-python-base-3.10-bookworm @@ -111,6 +113,7 @@ - docker/python-base/.* - docker/python-builder/.* - docker/uwsgi-base/.* + - zuul.d/docker-images/python-3.10-bookworm.yaml - job: name: system-config-upload-image-uwsgi-base-3.10-bookworm diff --git a/zuul.d/docker-images/python-3.10-bullseye.yaml b/zuul.d/docker-images/python-3.10-bullseye.yaml index 6b18cc0c72..bacf48a260 100644 --- a/zuul.d/docker-images/python-3.10-bullseye.yaml +++ b/zuul.d/docker-images/python-3.10-bullseye.yaml @@ -22,6 +22,7 @@ files: &python-builder_3_10_bullseye_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.10-bullseye.yaml - job: name: system-config-upload-image-python-builder-3.10-bullseye @@ -64,6 +65,7 @@ files: &python-base_3_10_bullseye_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.11-bullseye.yaml - job: name: system-config-upload-image-python-base-3.10-bullseye @@ -111,6 +113,7 @@ - docker/python-base/.* - docker/python-builder/.* - docker/uwsgi-base/.* + - zuul.d/docker-images/python-3.11-bullseye.yaml - job: name: system-config-upload-image-uwsgi-base-3.10-bullseye diff --git a/zuul.d/docker-images/python-3.11-bookworm.yaml b/zuul.d/docker-images/python-3.11-bookworm.yaml index 1c89fbb69d..38eece5bd6 100644 --- a/zuul.d/docker-images/python-3.11-bookworm.yaml +++ b/zuul.d/docker-images/python-3.11-bookworm.yaml @@ -22,6 +22,7 @@ files: &python-builder_3_11_bookworm_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.11-bookworm.yaml - job: name: system-config-upload-image-python-builder-3.11-bookworm @@ -64,6 +65,7 @@ files: &python-base_3_11_bookworm_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.11-bookworm.yaml - job: name: system-config-upload-image-python-base-3.11-bookworm @@ -111,6 +113,7 @@ - docker/python-base/.* - docker/python-builder/.* - docker/uwsgi-base/.* + - zuul.d/docker-images/python-3.11-bookworm.yaml - job: name: system-config-upload-image-uwsgi-base-3.11-bookworm diff --git a/zuul.d/docker-images/python-3.11-bullseye.yaml b/zuul.d/docker-images/python-3.11-bullseye.yaml index 3d9dcd361d..7dd65fc667 100644 --- a/zuul.d/docker-images/python-3.11-bullseye.yaml +++ b/zuul.d/docker-images/python-3.11-bullseye.yaml @@ -22,6 +22,7 @@ files: &python-builder_3_11_bullseye_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.11-bullseye.yaml - job: name: system-config-upload-image-python-builder-3.11-bullseye @@ -64,6 +65,7 @@ files: &python-base_3_11_bullseye_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.11-bullseye.yaml - job: name: system-config-upload-image-python-base-3.11-bullseye @@ -111,6 +113,7 @@ - docker/python-base/.* - docker/python-builder/.* - docker/uwsgi-base/.* + - zuul.d/docker-images/python-3.11-bullseye.yaml - job: name: system-config-upload-image-uwsgi-base-3.11-bullseye diff --git a/zuul.d/docker-images/python-3.9-bookworm.yaml b/zuul.d/docker-images/python-3.9-bookworm.yaml index d92d0135fb..2c4eb2ee94 100644 --- a/zuul.d/docker-images/python-3.9-bookworm.yaml +++ b/zuul.d/docker-images/python-3.9-bookworm.yaml @@ -22,6 +22,7 @@ files: &python-builder_3_9_bookworm_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.9-bookworm.yaml - job: name: system-config-upload-image-python-builder-3.9-bookworm @@ -64,6 +65,7 @@ files: &python-base_3_9_bookworm_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.9-bookworm.yaml - job: name: system-config-upload-image-python-base-3.9-bookworm @@ -111,6 +113,7 @@ - docker/python-base/.* - docker/python-builder/.* - docker/uwsgi-base/.* + - zuul.d/docker-images/python-3.9-bookworm.yaml - job: name: system-config-upload-image-uwsgi-base-3.9-bookworm diff --git a/zuul.d/docker-images/python-3.9-bullseye.yaml b/zuul.d/docker-images/python-3.9-bullseye.yaml index cb0ca3db61..2b96835c62 100644 --- a/zuul.d/docker-images/python-3.9-bullseye.yaml +++ b/zuul.d/docker-images/python-3.9-bullseye.yaml @@ -22,6 +22,7 @@ files: &python-builder_3_9_bullseye_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.9-bullseye.yaml - job: name: system-config-upload-image-python-builder-3.9-bullseye @@ -64,6 +65,7 @@ files: &python-base_3_9_bullseye_files - docker/python-base/ - docker/python-builder/ + - zuul.d/docker-images/python-3.9-bullseye.yaml - job: name: system-config-upload-image-python-base-3.9-bullseye @@ -111,6 +113,7 @@ - docker/python-base/.* - docker/python-builder/.* - docker/uwsgi-base/.* + - zuul.d/docker-images/python-3.9-bullseye.yaml - job: name: system-config-upload-image-uwsgi-base-3.9-bullseye