summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Kreger <juliaashleykreger@gmail.com>2021-09-15 11:05:21 -0700
committerJulia Kreger <juliaashleykreger@gmail.com>2021-09-15 14:04:35 -0700
commite8fc7cb6f91c336ac2f75f3233cdaac167d14b61 (patch)
treed9911460a6e52881018351f77151db11084959ca
parent38f655f6273ecb6d598a0e780b8a8f769fbec822 (diff)
downloadironic-e8fc7cb6f91c336ac2f75f3233cdaac167d14b61.tar.gz
Fix Redfish jobs by pinning sushy-tools
Sushy-tools pulls in master branch by default based on the job configuration, however we recently merged support into sushy-tools which requires a version of ironic-lib, which is unavailable to this system resulting in an exception. File "/opt/stack/sushy-tools/sushy_tools/emulator/main.py", line 24, in <module> from ironic_lib import auth_basic ImportError: cannot import name 'auth_basic' *Also* Temporarily disables the grub2 jobs to allow multiple fixes to be merged in sequence. Change-Id: Ie8c10db135a77bd4cc2e17a266a45cca65100199
-rw-r--r--zuul.d/ironic-jobs.yaml3
-rw-r--r--zuul.d/project.yaml6
2 files changed, 6 insertions, 3 deletions
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 6b0f14617..d28da1cb7 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -148,7 +148,8 @@
parent: ironic-base
timeout: 5400
required-projects:
- - openstack/sushy-tools
+ - name: openstack/sushy-tools
+ override-checkout: 0.17.0
vars:
devstack_localrc:
IRONIC_DEPLOY_DRIVER: redfish
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 77a1bc8ee..bd8bc32b7 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -24,7 +24,9 @@
- ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-indirect
- ironic-tempest-ipa-partition-bios-agent_ipmitool-indirect
- ironic-tempest-bfv
- - ironic-tempest-ipa-partition-uefi-pxe-grub2
+ # Temporary to allow for multiple breakages to be resolved.
+ - ironic-tempest-ipa-partition-uefi-pxe-grub2:
+ voting: false
- metalsmith-integration-glance-localboot-centos7
# Non-voting jobs
- ironic-tox-bandit:
@@ -61,7 +63,7 @@
- ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-indirect
- ironic-tempest-ipa-partition-bios-agent_ipmitool-indirect
- ironic-tempest-bfv
- - ironic-tempest-ipa-partition-uefi-pxe-grub2
+ # - ironic-tempest-ipa-partition-uefi-pxe-grub2
- metalsmith-integration-glance-localboot-centos7
experimental:
jobs: