diff options
| author | Zuul <zuul@review.opendev.org> | 2021-07-28 17:14:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-07-28 17:14:38 +0000 |
| commit | 2e7d67fee04340050abdf2065c7cc85b660fdf08 (patch) | |
| tree | 90576b174273cb3b7bf3b3487b7823eff1e9c3c1 | |
| parent | 2584cddde41222b615e0d12f1325a51bc90da588 (diff) | |
| parent | 1838c7153ce6bc9a70ab9d3f244d11cd48d93575 (diff) | |
| download | ironic-2e7d67fee04340050abdf2065c7cc85b660fdf08.tar.gz | |
Merge "Configure CI for bugfix/18.1" into bugfix/18.1
| -rw-r--r-- | devstack/lib/ironic | 2 | ||||
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 13 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 71e1508d1..0ab44d310 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -569,7 +569,7 @@ IRONIC_DEPLOY_FAST_TRACK=${IRONIC_DEPLOY_FAST_TRACK:-False} TEMPEST_BAREMETAL_MIN_MICROVERSION=${TEMPEST_BAREMETAL_MIN_MICROVERSION:-} # Define baremetal max_microversion in tempest config. No default value means that it is picked from tempest. -TEMPEST_BAREMETAL_MAX_MICROVERSION=${TEMPEST_BAREMETAL_MAX_MICROVERSION:-} +TEMPEST_BAREMETAL_MAX_MICROVERSION=${TEMPEST_BAREMETAL_MAX_MICROVERSION:-1.75} # TODO(TheJulia): This PHYSICAL_NETWORK needs to be refactored in # our devstack plugin. It is used by the neutron-legacy integration, diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 3e9291db6..f8e7f3aaa 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -7,8 +7,11 @@ post-run: playbooks/ci-workarounds/get_extra_logging.yaml timeout: 10800 required-projects: + - name: opendev.org/openstack/devstack + override-checkout: master - opendev.org/openstack/ironic - - opendev.org/openstack/ironic-python-agent + - name: opendev.org/openstack/ironic-python-agent + override-checkout: bugfix/8.1 - opendev.org/openstack/ironic-python-agent-builder - opendev.org/openstack/ironic-tempest-plugin - opendev.org/openstack/virtualbmc @@ -460,12 +463,16 @@ nodeset: openstack-two-node-focal pre-run: playbooks/ci-workarounds/pre.yaml required-projects: + - name: opendev.org/openstack/devstack + override-checkout: master - opendev.org/openstack/ironic - - opendev.org/openstack/ironic-python-agent + - name: opendev.org/openstack/ironic-python-agent + override-checkout: bugfix/8.1 - opendev.org/openstack/ironic-python-agent-builder - opendev.org/openstack/ironic-tempest-plugin - opendev.org/openstack/virtualbmc - - opendev.org/openstack/networking-generic-switch + - name: opendev.org/openstack/networking-generic-switch + override-checkout: master irrelevant-files: - ^.*\.rst$ - ^api-ref/.*$ diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 23aa568fb..888146843 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -46,8 +46,10 @@ voting: false - bifrost-integration-tinyipa-ubuntu-focal: voting: false + override-checkout: master - bifrost-integration-redfish-vmedia-uefi-centos-8: voting: false + override-checkout: master - ironic-tempest-pxe_ipmitool-postgres: voting: false - bifrost-benchmark-ironic: |