From 35b3d066e06e116b55b38c7dff08d3691b18e683 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Wed, 23 Nov 2022 10:42:40 +0100 Subject: [PATCH] Make the OS test flavours different to avoid flapping tests due to unstable sorting --- pkg/testutils/integrationtestharness.go | 2 +- .../create_cluster/ha_openstack/expected-v1alpha2.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/testutils/integrationtestharness.go b/pkg/testutils/integrationtestharness.go index c7b51b530e..d126244675 100644 --- a/pkg/testutils/integrationtestharness.go +++ b/pkg/testutils/integrationtestharness.go @@ -340,7 +340,7 @@ func SetupMockOpenstack() *openstack.MockCloud { flavors.Create(c.MockNovaClient.ServiceClient(), flavors.CreateOpts{ Name: "n1-standard-2", RAM: 8192, - VCPUs: 4, + VCPUs: 8, Disk: fi.PtrTo(16), }) flavors.Create(c.MockNovaClient.ServiceClient(), flavors.CreateOpts{ diff --git a/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml index 03328fb970..e3540b18ba 100644 --- a/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml @@ -79,7 +79,7 @@ metadata: name: control-plane-us-test1-1 spec: image: ubuntu-20.04 - machineType: n1-standard-2 + machineType: n1-standard-1 maxSize: 1 minSize: 1 role: Master @@ -97,7 +97,7 @@ metadata: name: control-plane-us-test1-2 spec: image: ubuntu-20.04 - machineType: n1-standard-2 + machineType: n1-standard-1 maxSize: 1 minSize: 1 role: Master @@ -115,7 +115,7 @@ metadata: name: control-plane-us-test1-3 spec: image: ubuntu-20.04 - machineType: n1-standard-2 + machineType: n1-standard-1 maxSize: 1 minSize: 1 role: Master @@ -133,7 +133,7 @@ metadata: name: nodes-us-test1 spec: image: ubuntu-20.04 - machineType: n1-standard-2 + machineType: n1-standard-1 maxSize: 1 minSize: 1 role: Node