From 3501282d9eb70add0ef555ac4d32664b10e0091f Mon Sep 17 00:00:00 2001 From: Sean Mooney Date: Mon, 2 Sep 2024 23:43:12 +0100 Subject: [PATCH] adjust job template to account for master vs main this change makes the opendev job template define override-checkout: main to account for the fact that the job will run on master. i also add a pragma section to make main and master implied alias and declare the default branch of this repo to be main. --- .zuul.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 7f7d724ed..1028fdc54 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -204,6 +204,7 @@ - project: name: openstack-k8s-operators/nova-operator + default-branch: main github-check: jobs: - openstack-meta-content-provider @@ -211,27 +212,35 @@ - nova-operator-tempest-multinode - nova-operator-tempest-multinode-ceph +- pragma: + implied-branch-matchers: True + implied-branches: + - main + - master + ########################################################## # # # Project Template # # # ########################################################## + - project-template: name: opendev-nova-edpm-pipeline description: | Project template to run meta content provider and EDPM job with master opendev and github operator content in openstack-experimental pipeline. - openstack-experimental: + openstack-experimental: &experimentalJobs jobs: - openstack-meta-content-provider: + override-checkout: main vars: cifmw_bop_openstack_release: master cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos9-master" cifmw_repo_setup_branch: master - nova-operator-tempest-multinode: &job_vars + override-checkout: main vars: cifmw_repo_setup_branch: master - dependencies: - - openstack-meta-content-provider - nova-operator-tempest-multinode-ceph: *job_vars + experimental: *experimentalJobs