summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Tantsur <dtantsur@protonmail.com>2022-01-31 16:32:08 +0100
committerDmitry Tantsur <dtantsur@protonmail.com>2022-02-01 10:47:28 +0100
commitc8a02c59d8d31d9df61fe50bb25f81d79c28e751 (patch)
tree013b2289779da6b76e1531535bcbc3b4301dd2a0
parent3a26f941d32fbc609c84e99a615550ee81d19b3c (diff)
downloadironic-c8a02c59d8d31d9df61fe50bb25f81d79c28e751.tar.gz
Avoid non-Stream CentOS, remove Grenade job
This is a partial cherry-pick of 720b42d538c406d852651758375e02ef29d82cc5, we don't need to disable the standalone job since it's not broken here. On Victoria we also remove the Grenade job because Ussuri is EM now. Change-Id: I8bd051ea709d328cb5efa2c2cbd5a226bdb4cfd3 (cherry picked from commit 720b42d538c406d852651758375e02ef29d82cc5)
-rw-r--r--devstack/lib/ironic2
-rw-r--r--zuul.d/project.yaml2
2 files changed, 1 insertions, 3 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 5795ead15..5f39e97b7 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -316,7 +316,7 @@ if [[ -z "$IRONIC_DIB_RAMDISK_OPTIONS" ]]; then
if [[ "$IRONIC_DIB_RAMDISK_OS" == "centos8" ]]; then
# Adapt for DIB naming change
IRONIC_DIB_RAMDISK_OS=centos
- IRONIC_DIB_RAMDISK_RELEASE=8
+ IRONIC_DIB_RAMDISK_RELEASE=8-stream
fi
IRONIC_DIB_RAMDISK_OPTIONS="$IRONIC_DIB_RAMDISK_OS"
fi
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 06f88746b..226600a1d 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -12,7 +12,6 @@
- ironic-standalone
- ironic-standalone-redfish
- ironic-tempest-functional-python3
- - ironic-grenade
- ironic-tempest-partition-bios-redfish-pxe
- ironic-tempest-partition-uefi-redfish-vmedia
- ironic-tempest-wholedisk-bios-snmp-pxe
@@ -45,7 +44,6 @@
- ironic-standalone
- ironic-standalone-redfish
- ironic-tempest-functional-python3
- - ironic-grenade
- ironic-tempest-partition-bios-redfish-pxe
- ironic-tempest-partition-uefi-redfish-vmedia
- ironic-tempest-wholedisk-bios-snmp-pxe