diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-22 17:02:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-22 17:02:59 +0000 |
| commit | 1d11c370fa235bef715e64484013ab1000aa2f33 (patch) | |
| tree | 1beec863c1a47b0022fd65864ba01862e6d849bf | |
| parent | f2431ed1f4112a4781362229b75af2353b24dbfd (diff) | |
| parent | a9c129f56f55a53f447056976fd9e7e7b6b502a6 (diff) | |
| download | ironic-1d11c370fa235bef715e64484013ab1000aa2f33.tar.gz | |
Merge "CI: fix ussuri branch" into stable/ussuri
| -rw-r--r-- | devstack/lib/ironic | 2 | ||||
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 6 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 06b1a03c1..e6d774c27 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -42,7 +42,7 @@ GITBRANCH["pyghmi"]=${PYGHMI_BRANCH:-master} GITDIR["pyghmi"]=$DEST/pyghmi GITREPO["virtualbmc"]=${VIRTUALBMC_REPO:-${GIT_BASE}/openstack/virtualbmc.git} -GITBRANCH["virtualbmc"]=${VIRTUALBMC_BRANCH:-master} +GITBRANCH["virtualbmc"]=${VIRTUALBMC_BRANCH:-835fd3b9e4cbb33a297e979db93df55498ff6ce0} GITDIR["virtualbmc"]=$DEST/virtualbmc GITREPO["virtualpdu"]=${VIRTUALPDU_REPO:-${GIT_BASE}/openstack/virtualpdu.git} diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index d28da1cb7..66b7e0bed 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -11,7 +11,8 @@ - name: openstack/ironic-python-agent-builder override-checkout: 2.2.0 - openstack/ironic-tempest-plugin - - openstack/virtualbmc + - name: openstack/virtualbmc + override-checkout: 2.2.0 irrelevant-files: - ^.*\.rst$ - ^api-ref/.*$ @@ -170,6 +171,7 @@ SWIFT_ENABLE_TEMPURLS: True SWIFT_TEMPURL_KEY: secretkey IRONIC_AUTOMATED_CLEAN_ENABLED: False + IRONIC_DEFAULT_DEPLOY_INTERFACE: direct devstack_services: s-account: True s-container: True @@ -228,6 +230,7 @@ IRONIC_VM_SPECS_RAM: 3096 SWIFT_ENABLE_TEMPURLS: True SWIFT_TEMPURL_KEY: secretkey + tempest_test_regex: test_baremetal_server_ops_wholedisk_image devstack_services: s-account: True s-container: True @@ -725,6 +728,7 @@ SWIFT_ENABLE_TEMPURLS: True SWIFT_TEMPURL_KEY: secretkey IRONIC_AUTOMATED_CLEAN_ENABLED: False + tempest_test_regex: test_baremetal_server_ops_wholedisk_image devstack_services: s-account: True s-container: True diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 77a1bc8ee..4a5982c77 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -19,7 +19,6 @@ # ramdisk OS. - ironic-tempest-ipa-partition-uefi-pxe_ipmitool: voting: false - - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-indirect - ironic-tempest-ipa-partition-bios-agent_ipmitool-indirect @@ -45,8 +44,10 @@ voting: false - ironic-tempest-ipxe-ipv6: voting: false + # NOTE(TheJulia): high-ish failure rate due to memory footprint, + # Commenting out for now. + # - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode gate: - queue: ironic jobs: - ironic-tox-unit-with-driver-libs - ironic-standalone @@ -56,7 +57,6 @@ - ironic-tempest-ipa-partition-pxe_ipmitool # Removing from voting due to memory consumption # - ironic-tempest-ipa-partition-uefi-pxe_ipmitool - - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-indirect - ironic-tempest-ipa-partition-bios-agent_ipmitool-indirect |