Fix file matchers in docker/container jobs

This corrects and simplifies the file matchers for these jobs at
the expense of possibly running some extra jobs in some cases.

The alternative is a lot of duplicated lists that will be hard
to maintain.

Change-Id: I97406cd0506a438e4b14bbbee3d1b61026f40cd7
This commit is contained in:
James E. Blair 2023-03-22 14:28:56 -07:00
parent e4ac244bd8
commit 40f9c38d0c

View File

@ -107,9 +107,6 @@
abstract: true abstract: true
description: | description: |
A parent job for both docker and container image building jobs. A parent job for both docker and container image building jobs.
files:
- roles/ensure-package-repositories/.*
- test-playbooks/container/.*
nodeset: nodeset:
nodes: nodes:
- name: builder - name: builder
@ -127,8 +124,14 @@
description: | description: |
A parent for container image building jobs. A parent for container image building jobs.
files: files:
- test-playbooks/container/.*
- roles/ensure-package-repositories/.*
- roles/build-container-image/.* - roles/build-container-image/.*
- roles/upload-container-image/.* - roles/upload-container-image/.*
- roles/promote-container-image/.*
- roles/ensure-docker/.*
- roles/ensure-podman/.*
- roles/ensure-skopeo/.*
vars: vars:
promote: false promote: false
roleset: container roleset: container
@ -139,8 +142,6 @@
parent: zuul-jobs-test-build-container-image-base parent: zuul-jobs-test-build-container-image-base
description: | description: |
Test building a container image with docker in a release pipeline. Test building a container image with docker in a release pipeline.
files:
- roles/ensure-docker/.*
vars: vars:
container_command: docker container_command: docker
@ -149,8 +150,6 @@
parent: zuul-jobs-test-build-container-image-base parent: zuul-jobs-test-build-container-image-base
description: | description: |
Test building a container image with podman in a release pipeline. Test building a container image with podman in a release pipeline.
files:
- roles/ensure-podman/.*
vars: vars:
container_command: podman container_command: podman
@ -160,9 +159,6 @@
abstract: true abstract: true
description: | description: |
Test building a container image in gate and promote pipelines. Test building a container image in gate and promote pipelines.
files:
- roles/ensure-skopeo/.*
- roles/promote-container-image/.*
vars: vars:
promote: true promote: true
@ -171,8 +167,6 @@
parent: zuul-jobs-test-build-container-image-promote-base parent: zuul-jobs-test-build-container-image-promote-base
description: | description: |
Test building a container image with docker in a promote pipeline. Test building a container image with docker in a promote pipeline.
files:
- roles/ensure-docker/.*
vars: vars:
container_command: docker container_command: docker
@ -181,8 +175,6 @@
parent: zuul-jobs-test-build-container-image-promote-base parent: zuul-jobs-test-build-container-image-promote-base
description: | description: |
Test building a container image with podman in a promote pipeline. Test building a container image with podman in a promote pipeline.
files:
- roles/ensure-podman/.*
vars: vars:
container_command: podman container_command: podman
@ -195,9 +187,11 @@
description: | description: |
A parent for docker image building jobs. A parent for docker image building jobs.
files: files:
- roles/ensure-docker/.* - test-playbooks/container/.*
- roles/ensure-package-repositories/.*
- roles/build-docker-image/.* - roles/build-docker-image/.*
- roles/upload-docker-image/.* - roles/upload-docker-image/.*
- roles/ensure-docker/.*
vars: vars:
container_command: docker container_command: docker
multiarch: false multiarch: false