From fa2ca05dababf6a8c41b66b9fb5dc2a94bc1c54c Mon Sep 17 00:00:00 2001 From: Andrew Bays Date: Thu, 14 Nov 2024 14:50:41 +0000 Subject: [PATCH] Fix the OSBMS scaling KUTTL test --- ...irector_v1beta1_openstackbaremetalset.yaml | 2 +- ...ctor_v1beta1_openstackprovisionserver.yaml | 2 +- tests/kuttl/common/scripts/delete_bmh.sh | 9 ++++---- .../04-assert.yaml | 2 +- .../03-assert.yaml | 6 ++--- .../03-create_openstackbaremetalset.yaml | 10 +++++++-- .../04-assert.yaml | 12 +++++----- .../04-scale_up_openstackbaremetalset.yaml | 4 ++-- .../06-assert.yaml | 8 +++---- .../07-assert.yaml | 4 ++-- .../09-assert.yaml | 22 ++----------------- .../09-errors.yaml | 11 ---------- .../10-assert.yaml | 7 ++---- .../10-errors.yaml | 4 ++-- .../10-scale_down_openstackbaremetalset.yaml | 2 +- .../11-assert.yaml | 7 ++---- .../11-errors.yaml | 4 ++-- .../11-scale_up_openstackbaremetalset.yaml | 2 +- .../12-assert.yaml | 18 ++++++++------- .../13-assert.yaml | 18 ++++++++++----- .../13-errors.yaml | 4 ++-- .../02-assert.yaml | 2 +- .../03-assert.yaml | 2 +- .../06-assert.yaml | 2 +- .../07-assert.yaml | 2 +- 25 files changed, 73 insertions(+), 93 deletions(-) delete mode 100644 tests/kuttl/tests/openstackbaremetalset_scale/09-errors.yaml diff --git a/config/samples/osp-director_v1beta1_openstackbaremetalset.yaml b/config/samples/osp-director_v1beta1_openstackbaremetalset.yaml index 64706a22..1608f0e9 100644 --- a/config/samples/osp-director_v1beta1_openstackbaremetalset.yaml +++ b/config/samples/osp-director_v1beta1_openstackbaremetalset.yaml @@ -7,7 +7,7 @@ spec: # How many nodes to provision count: 1 # The image to install on the provisioned nodes - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 # use this provisionServerName instead of creating a new one use baseImageUrl provisionServerName: openstack # The secret containing the SSH pub key to place on the provisioned nodes diff --git a/config/samples/osp-director_v1beta1_openstackprovisionserver.yaml b/config/samples/osp-director_v1beta1_openstackprovisionserver.yaml index 7b1aacd0..177326b1 100644 --- a/config/samples/osp-director_v1beta1_openstackprovisionserver.yaml +++ b/config/samples/osp-director_v1beta1_openstackprovisionserver.yaml @@ -5,5 +5,5 @@ metadata: namespace: openstack spec: port: 6190 - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 interface: br-ctlplane diff --git a/tests/kuttl/common/scripts/delete_bmh.sh b/tests/kuttl/common/scripts/delete_bmh.sh index ed5b4dac..48edbeb4 100755 --- a/tests/kuttl/common/scripts/delete_bmh.sh +++ b/tests/kuttl/common/scripts/delete_bmh.sh @@ -4,11 +4,12 @@ # Dumps a BMH and its credentials secret to designated locations and then deletes the BMH # -bmhname=$(oc get -n openstack osbms compute -o json | jq -r '.status.baremetalHosts["compute-0"].hostRef') -bmhsecretname=$(oc get bmh -n openshift-machine-api ${bmhname} -o json | jq -r '.spec.bmc.credentialsName') -oc get -n openshift-machine-api bmh ${bmhname} -o json |\ +bmhname=$(oc get bmh -n openshift-machine-api -l osp-director.openstack.org/name=compute -l osp-director.openstack.org/namespace=openstack -o name | head -1) +bmhsecretname=$(oc get -n openshift-machine-api ${bmhname} -o json | jq -r '.spec.bmc.credentialsName') +oc get -n openshift-machine-api ${bmhname} -o json |\ jq 'del(.metadata.labels,.metadata.annotations,.metadata.generation,.metadata.resourceVersion,.metadata.uid,.spec.consumerRef,.spec.userData,.spec.networkData,.spec.image)' |\ +jq '.metadata.annotations={"inspect.metal3.io": "disabled"}' |\ jq '.spec.online=false' > /tmp/kuttl_bmh1.json oc get -n openshift-machine-api secret ${bmhsecretname} -o json |\ jq 'del(.metadata.labels,.metadata.annotations,.metadata.generation,.metadata.resourceVersion,.metadata.uid,.metadata.ownerReferences)' > /tmp/kuttl_bmh1_secret.json -oc delete -n openshift-machine-api bmh ${bmhname} +oc delete -n openshift-machine-api ${bmhname} diff --git a/tests/kuttl/tests/openstackbackuprequest_save_restore/04-assert.yaml b/tests/kuttl/tests/openstackbackuprequest_save_restore/04-assert.yaml index dd87e2ba..611a0e89 100644 --- a/tests/kuttl/tests/openstackbackuprequest_save_restore/04-assert.yaml +++ b/tests/kuttl/tests/openstackbackuprequest_save_restore/04-assert.yaml @@ -61,7 +61,7 @@ spec: kind: OpenStackBaremetalSet metadata: finalizers: - - baremetalset.osp-director.openstack.org-compute + - baremetalset.osp-director.openstack.org name: compute namespace: openstack openStackClients: diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/03-assert.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/03-assert.yaml index ebe1b81f..7c525434 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/03-assert.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/03-assert.yaml @@ -10,7 +10,7 @@ apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackBaremetalSet metadata: finalizers: - - baremetalset.osp-director.openstack.org-compute + - baremetalset.osp-director.openstack.org labels: ooo-subnetname/ctlplane: "true" ooo-subnetname/internal_api: "true" @@ -19,7 +19,7 @@ metadata: name: compute namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 count: 0 ctlplaneInterface: enp1s0 deploymentSSHSecret: osp-controlplane-ssh-keys @@ -41,7 +41,7 @@ metadata: name: openstack namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 interface: br-ctlplane port: 6190 status: diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/03-create_openstackbaremetalset.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/03-create_openstackbaremetalset.yaml index f15376e1..1b36d445 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/03-create_openstackbaremetalset.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/03-create_openstackbaremetalset.yaml @@ -11,8 +11,14 @@ commands: - command: | oc patch provisioning provisioning-configuration --type='json' -p='[{"op": "replace", "path": "/spec/provisioningInterface", "value": "br-ctlplane"}]' namespaced: true - - command: oc delete pods -n openshift-machine-api -l baremetal.openshift.io/cluster-baremetal-operator=metal3-state - namespaced: true + # Delete the Metal3 pod so that it is recreated and works with the br-ctlplane bridge that was + # created in the previous step. The scale command below will cause the existing Metal3 pod to + # terminate, but then the baremetal cluster operator will reset the replicas to 1 and create a + # new pod + - script: | + oc scale deployment metal3 -n openshift-machine-api --replicas=0 + sleep 10 + oc wait deployment metal3 -n openshift-machine-api --for condition=Available --timeout=300s # Create the required userpassword Secret - command: oc apply -f ../../common/manifests/userpassword.yaml namespaced: true diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/04-assert.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/04-assert.yaml index 7e20705a..dad3371c 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/04-assert.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/04-assert.yaml @@ -15,11 +15,11 @@ apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackBaremetalSet metadata: finalizers: - - baremetalset.osp-director.openstack.org-compute + - baremetalset.osp-director.openstack.org name: compute namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 count: 2 ctlplaneInterface: enp1s0 deploymentSSHSecret: osp-controlplane-ssh-keys @@ -70,7 +70,7 @@ spec: namespace: openshift-machine-api online: true rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" userData: namespace: openshift-machine-api status: @@ -82,7 +82,7 @@ status: provisioning: bootMode: legacy rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" state: provisioned --- apiVersion: metal3.io/v1alpha1 @@ -107,7 +107,7 @@ spec: namespace: openshift-machine-api online: true rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" userData: namespace: openshift-machine-api status: @@ -119,7 +119,7 @@ status: provisioning: bootMode: legacy rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" state: provisioned --- apiVersion: osp-director.openstack.org/v1beta1 diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/04-scale_up_openstackbaremetalset.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/04-scale_up_openstackbaremetalset.yaml index a372052a..dd7afc55 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/04-scale_up_openstackbaremetalset.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/04-scale_up_openstackbaremetalset.yaml @@ -1,7 +1,7 @@ # # - Scale OpenStackBaremetalSet to 2 BaremetalHosts # - Also try to then immediately scale to 3, which should fail due to webhook validation (because we only -# have 2 BMHs available) and thus do nothing +# have 2 BMHs available in a standard osp-director-dev-tools cluster) and thus do nothing # apiVersion: kuttl.dev/v1beta1 @@ -12,7 +12,7 @@ commands: namespaced: true - script: | RES=$(oc patch -n openstack openstackbaremetalset compute --type='json' -p='[{"op": "replace", "path": "/spec/count", "value":3}]' 2>&1) - if grep -q "Unable to find 3 requested BaremetalHost count" <<< "$RES"; then + if grep -qi "unable to find 3 requested BaremetalHost count" <<< "$RES"; then exit 0 else exit 1 diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/06-assert.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/06-assert.yaml index e5f96367..6a068359 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/06-assert.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/06-assert.yaml @@ -11,11 +11,11 @@ apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackBaremetalSet metadata: finalizers: - - baremetalset.osp-director.openstack.org-compute + - baremetalset.osp-director.openstack.org name: compute namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 count: 1 ctlplaneInterface: enp1s0 deploymentSSHSecret: osp-controlplane-ssh-keys @@ -76,7 +76,7 @@ spec: namespace: openshift-machine-api online: true rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" userData: namespace: openshift-machine-api status: @@ -88,7 +88,7 @@ status: provisioning: bootMode: legacy rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" state: provisioned --- apiVersion: osp-director.openstack.org/v1beta1 diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/07-assert.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/07-assert.yaml index f1c061a2..94781ae1 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/07-assert.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/07-assert.yaml @@ -26,7 +26,7 @@ spec: namespace: openshift-machine-api online: true rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" userData: namespace: openshift-machine-api status: @@ -38,7 +38,7 @@ status: provisioning: bootMode: legacy rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" state: provisioned --- # We don't know which BMH was chosen as compute-0 originally, so we just look diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/09-assert.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/09-assert.yaml index 8726c925..44ca24b7 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/09-assert.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/09-assert.yaml @@ -8,7 +8,7 @@ apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackBaremetalSet metadata: finalizers: - - baremetalset.osp-director.openstack.org-compute + - baremetalset.osp-director.openstack.org labels: ooo-subnetname/ctlplane: "true" ooo-subnetname/internal_api: "true" @@ -17,7 +17,7 @@ metadata: name: compute namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 count: 2 ctlplaneInterface: enp1s0 roleName: Compute @@ -32,21 +32,3 @@ status: provisioningStatus: readyCount: 1 state: Error ---- -# We don't know which BMH was chosen as compute-0 originally, so we use a script to -# check for the "BaremetalHostNotFound" error (as the actual error message will vary -# based on which BMH was actually deleted) -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -namespaced: true -timeout: 600 -commands: - - script: | - set -x - sleep 5 - osbmsstate=$(oc get osbms -n openstack compute -o json | jq -r '.status.provisioningStatus.reason') - if grep -q "Please check BaremetalHost resources and re-add" <<< "$osbmsstate"; then - exit 0 - else - exit 1 - fi diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/09-errors.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/09-errors.yaml deleted file mode 100644 index b3c5cb56..00000000 --- a/tests/kuttl/tests/openstackbaremetalset_scale/09-errors.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# -# Check for: -# -# - 1 BaremetalHost (should be deleted) -# - -apiVersion: metal3.io/v1alpha1 -kind: BareMetalHost -metadata: - name: openshift-worker-0 - namespace: openshift-machine-api diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/10-assert.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/10-assert.yaml index d1b421ac..bbe846a0 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/10-assert.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/10-assert.yaml @@ -11,11 +11,11 @@ apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackBaremetalSet metadata: finalizers: - - baremetalset.osp-director.openstack.org-compute + - baremetalset.osp-director.openstack.org name: compute namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 count: 2 ctlplaneInterface: enp1s0 deploymentSSHSecret: osp-controlplane-ssh-keys @@ -33,7 +33,4 @@ status: hostname: compute-1 provisioningStatus: readyCount: 1 - reason: Existing BaremetalHost "openshift-worker-0" not found for OpenStackBaremetalSet - compute. Please check BaremetalHost resources and re-add "openshift-worker-0" - to continue state: Error diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/10-errors.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/10-errors.yaml index 1e6639c9..b63531be 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/10-errors.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/10-errors.yaml @@ -8,8 +8,8 @@ apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackBaremetalSet metadata: finalizers: - - baremetalset.osp-director.openstack.org-compute + - baremetalset.osp-director.openstack.org name: compute namespace: openstack spec: - coubt: 1 + count: 1 diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/10-scale_down_openstackbaremetalset.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/10-scale_down_openstackbaremetalset.yaml index 741de0ad..70d97d9e 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/10-scale_down_openstackbaremetalset.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/10-scale_down_openstackbaremetalset.yaml @@ -7,7 +7,7 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep commands: - - command: oc annotate bmh openshift-worker-1 osp-director.openstack.org/delete-host=true -n openshift-machine-api + - command: oc annotate bmh -l osp-director.openstack.org/name=compute -l osp-director.openstack.org/namespace=openstack osp-director.openstack.org/delete-host=true -n openshift-machine-api namespaced: true - script: | RES=$(oc patch -n openstack openstackbaremetalset compute --type='json' -p='[{"op": "replace", "path": "/spec/count", "value":1}]' 2>&1) diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/11-assert.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/11-assert.yaml index d1b421ac..bbe846a0 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/11-assert.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/11-assert.yaml @@ -11,11 +11,11 @@ apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackBaremetalSet metadata: finalizers: - - baremetalset.osp-director.openstack.org-compute + - baremetalset.osp-director.openstack.org name: compute namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 count: 2 ctlplaneInterface: enp1s0 deploymentSSHSecret: osp-controlplane-ssh-keys @@ -33,7 +33,4 @@ status: hostname: compute-1 provisioningStatus: readyCount: 1 - reason: Existing BaremetalHost "openshift-worker-0" not found for OpenStackBaremetalSet - compute. Please check BaremetalHost resources and re-add "openshift-worker-0" - to continue state: Error diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/11-errors.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/11-errors.yaml index 1e6639c9..739aea40 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/11-errors.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/11-errors.yaml @@ -8,8 +8,8 @@ apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackBaremetalSet metadata: finalizers: - - baremetalset.osp-director.openstack.org-compute + - baremetalset.osp-director.openstack.org name: compute namespace: openstack spec: - coubt: 1 + count: 3 diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/11-scale_up_openstackbaremetalset.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/11-scale_up_openstackbaremetalset.yaml index d64512fc..ebfe569a 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/11-scale_up_openstackbaremetalset.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/11-scale_up_openstackbaremetalset.yaml @@ -7,7 +7,7 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep commands: - - command: oc annotate bmh openshift-worker-1 osp-director.openstack.org/delete-host- -n openshift-machine-api --overwrite + - command: oc annotate bmh -l osp-director.openstack.org/name=compute -l osp-director.openstack.org/namespace=openstack osp-director.openstack.org/delete-host- -n openshift-machine-api namespaced: true - script: | RES=$(oc patch -n openstack openstackbaremetalset compute --type='json' -p='[{"op": "replace", "path": "/spec/count", "value":3}]' 2>&1) diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/12-assert.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/12-assert.yaml index 800af458..53aa8955 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/12-assert.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/12-assert.yaml @@ -13,11 +13,11 @@ apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackBaremetalSet metadata: finalizers: - - baremetalset.osp-director.openstack.org-compute + - baremetalset.osp-director.openstack.org name: compute namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 count: 2 ctlplaneInterface: enp1s0 deploymentSSHSecret: osp-controlplane-ssh-keys @@ -31,12 +31,14 @@ status: baremetalHosts: compute-0: annotatedForDeletion: false - ctlplaneIP: 172.22.0.140/24 + ipaddresses: + ctlplane: 172.22.0.140/24 hostname: compute-0 provisioningState: provisioned compute-1: annotatedForDeletion: false - ctlplaneIP: 172.22.0.100/24 + ipaddresses: + ctlplane: 172.22.0.100/24 hostname: compute-1 provisioningState: provisioned provisioningStatus: @@ -66,7 +68,7 @@ spec: namespace: openshift-machine-api online: true rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" userData: namespace: openshift-machine-api status: @@ -78,7 +80,7 @@ status: provisioning: bootMode: legacy rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" state: provisioned --- apiVersion: metal3.io/v1alpha1 @@ -103,7 +105,7 @@ spec: namespace: openshift-machine-api online: true rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" userData: namespace: openshift-machine-api status: @@ -115,5 +117,5 @@ status: provisioning: bootMode: legacy rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" state: provisioned diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/13-assert.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/13-assert.yaml index f08ea485..a07eebf3 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/13-assert.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/13-assert.yaml @@ -39,10 +39,12 @@ status: currentState: Configured reservations: compute-0: - deleted: false + # The reservation is deleted because the OSBMS is deleted, and thus the role is gone + deleted: true ip: 172.22.0.140 compute-1: - deleted: false + # The reservation is deleted because the OSBMS is deleted, and thus the role is gone + deleted: true ip: 172.22.0.100 controlplane: deleted: false @@ -86,10 +88,12 @@ status: currentState: Configured reservations: compute-0: - deleted: false + # The reservation is deleted because the OSBMS is deleted, and thus the role is gone + deleted: true ip: 172.17.0.40 compute-1: - deleted: false + # The reservation is deleted because the OSBMS is deleted, and thus the role is gone + deleted: true ip: 172.17.0.11 controlplane: deleted: false @@ -117,10 +121,12 @@ status: currentState: Configured reservations: compute-0: - deleted: false + # The reservation is deleted because the OSBMS is deleted, and thus the role is gone + deleted: true ip: 172.20.0.40 compute-1: - deleted: false + # The reservation is deleted because the OSBMS is deleted, and thus the role is gone + deleted: true ip: 172.20.0.10 reservedIpCount: 2 --- diff --git a/tests/kuttl/tests/openstackbaremetalset_scale/13-errors.yaml b/tests/kuttl/tests/openstackbaremetalset_scale/13-errors.yaml index 12ba5d72..7c2b649c 100644 --- a/tests/kuttl/tests/openstackbaremetalset_scale/13-errors.yaml +++ b/tests/kuttl/tests/openstackbaremetalset_scale/13-errors.yaml @@ -38,7 +38,7 @@ status: provisioning: bootMode: legacy rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" state: provisioned --- apiVersion: metal3.io/v1alpha1 @@ -61,5 +61,5 @@ status: provisioning: bootMode: legacy rootDeviceHints: - deviceName: /dev/sda + hctl: "0:0:0:0" state: provisioned diff --git a/tests/kuttl/tests/openstackprovisionserver_unique_port/02-assert.yaml b/tests/kuttl/tests/openstackprovisionserver_unique_port/02-assert.yaml index 3e632604..a28de8c6 100644 --- a/tests/kuttl/tests/openstackprovisionserver_unique_port/02-assert.yaml +++ b/tests/kuttl/tests/openstackprovisionserver_unique_port/02-assert.yaml @@ -10,7 +10,7 @@ metadata: name: openstack namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 interface: br-ctlplane port: 6190 status: diff --git a/tests/kuttl/tests/openstackprovisionserver_unique_port/03-assert.yaml b/tests/kuttl/tests/openstackprovisionserver_unique_port/03-assert.yaml index 314965e9..53f4120f 100644 --- a/tests/kuttl/tests/openstackprovisionserver_unique_port/03-assert.yaml +++ b/tests/kuttl/tests/openstackprovisionserver_unique_port/03-assert.yaml @@ -10,7 +10,7 @@ metadata: name: goodprov namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 port: 6191 status: conditions: diff --git a/tests/kuttl/tests/openstackprovisionserver_unique_port/06-assert.yaml b/tests/kuttl/tests/openstackprovisionserver_unique_port/06-assert.yaml index ee36a5e1..032ac829 100644 --- a/tests/kuttl/tests/openstackprovisionserver_unique_port/06-assert.yaml +++ b/tests/kuttl/tests/openstackprovisionserver_unique_port/06-assert.yaml @@ -10,7 +10,7 @@ metadata: name: compute-provisionserver namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 port: 6190 status: conditions: diff --git a/tests/kuttl/tests/openstackprovisionserver_unique_port/07-assert.yaml b/tests/kuttl/tests/openstackprovisionserver_unique_port/07-assert.yaml index 44aff7fb..d958b616 100644 --- a/tests/kuttl/tests/openstackprovisionserver_unique_port/07-assert.yaml +++ b/tests/kuttl/tests/openstackprovisionserver_unique_port/07-assert.yaml @@ -10,7 +10,7 @@ metadata: name: compute2-provisionserver namespace: openstack spec: - baseImageUrl: http://192.168.111.1/images/rhel-guest-image-8.4-992.x86_64.qcow2 + baseImageUrl: http://192.168.111.1/images/rhel-guest-image-9.2-20230414.17.x86_64.qcow2 port: 6191 status: conditions: