From 36640ad7babd30c06d9c6d7819310ce2f5299972 Mon Sep 17 00:00:00 2001 From: Pablo Rodriguez Nava Date: Tue, 12 Sep 2023 14:41:08 +0200 Subject: [PATCH] Replace EDPM job redefinition with a proper template To avoid redefining jobs that are exact copies of the ci-framework ones we are introducing zuul templates that already define those jobs. This will allow easier maintainability as a change that needs to be applied in the base job and in every child one (ex. var removal, type change, etc.) won't require a change in every repo, just one change in the base one in ci-framework. --- zuul.d/jobs.yaml | 35 ----------------------------------- zuul.d/projects.yaml | 9 ++------- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 zuul.d/jobs.yaml diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml deleted file mode 100644 index b3d8085f0..000000000 --- a/zuul.d/jobs.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -- job: - name: openstack-operator-content-provider - parent: content-provider-base - vars: - cifmw_operator_build_org: openstack-k8s-operators - cifmw_operator_build_operators: - - name: "openstack-operator" - src: "~/src/github.com/{{ cifmw_operator_build_org }}/openstack-operator" - image_base: openstack - irrelevant-files: &openstack_if - - tests/kuttl - - containers/ci - - .github/workflows - - .ci-operator.yaml - - .dockerignore - - .gitignore - - .golangci.yaml - - .pre-commit-config.yaml - - LICENSE - - OWNERS* - - PROJECT - - .*/*.md - - kuttl-test.yaml - - renovate.json - -- job: - name: openstack-operator-podified-multinode-edpm-deployment-crc - parent: podified-multinode-edpm-deployment-crc - irrelevant-files: *openstack_if - -- job: - name: openstack-operator-crc-podified-edpm-baremetal - parent: cifmw-crc-podified-edpm-baremetal - irrelevant-files: *openstack_if diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 7282149d1..24c5c394b 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -1,10 +1,5 @@ --- - project: name: openstack-k8s-operators/openstack-operator - github-check: - jobs: - - openstack-operator-content-provider - - openstack-operator-crc-podified-edpm-baremetal: &content_provider - dependencies: - - openstack-operator-content-provider - - openstack-operator-podified-multinode-edpm-deployment-crc: *content_provider + templates: + - podified-multinode-edpm-baremetal-pipeline