Skip to content

Commit e4710f6

Browse files
committed
Remove invalid worker offering test case because it's redundant to invalid control plane offering test case
Change the IP address and port number of the second cluster to make the test work in the prow
1 parent 9ea981f commit e4710f6

File tree

5 files changed

+5
-28
lines changed

5 files changed

+5
-28
lines changed

test/e2e/common.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import (
2121
"encoding/base64"
2222
"errors"
2323
"fmt"
24-
apierrors "k8s.io/apimachinery/pkg/api/errors"
2524
"os"
2625
"path/filepath"
2726
"strings"
2827

28+
apierrors "k8s.io/apimachinery/pkg/api/errors"
29+
2930
"github.com/apache/cloudstack-go/v2/cloudstack"
3031
"github.com/blang/semver"
3132
. "github.com/onsi/ginkgo"
@@ -57,7 +58,6 @@ const (
5758
InvalidTemplateName = "CLOUDSTACK_INVALID_TEMPLATE_NAME"
5859
InvalidCPOfferingName = "CLOUDSTACK_INVALID_CONTROL_PLANE_MACHINE_OFFERING"
5960
ExtremelyLargeCPOfferingName = "CLOUDSTACK_EXTREMELY_LARGE_CONTROL_PLANE_MACHINE_OFFERING"
60-
InvalidWorkerOfferingName = "CLOUDSTACK_INVALID_WORKER_MACHINE_OFFERING"
6161
)
6262

6363
const (

test/e2e/config/cloudstack.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,14 @@ variables:
113113
CLOUDSTACK_NETWORK_NAME: isolated-for-e2e-1
114114
CLOUDSTACK_NEW_NETWORK_NAME: isolated-for-e2e-new
115115
CLUSTER_ENDPOINT_IP: 172.16.2.199
116-
CLUSTER_ENDPOINT_IP_2: 172.16.2.199
116+
CLUSTER_ENDPOINT_IP_2: 172.16.2.198
117117
CLUSTER_ENDPOINT_NEW_IP: 172.16.2.201
118118
CLUSTER_ENDPOINT_PORT: 6443
119-
CLUSTER_ENDPOINT_PORT_2: 6444
119+
CLUSTER_ENDPOINT_PORT_2: 6443
120120
CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING: "Large Instance"
121121
CLOUDSTACK_INVALID_CONTROL_PLANE_MACHINE_OFFERING: "OfferingXXXX"
122122
CLOUDSTACK_EXTREMELY_LARGE_CONTROL_PLANE_MACHINE_OFFERING: "Extremely Large Instance"
123123
CLOUDSTACK_WORKER_MACHINE_OFFERING: "Medium Instance"
124-
CLOUDSTACK_INVALID_WORKER_MACHINE_OFFERING: "OfferingYYYY"
125124
CLOUDSTACK_TEMPLATE_NAME: kube-v1.20.10/ubuntu-2004
126125
CLOUDSTACK_INVALID_TEMPLATE_NAME: templateXXXX
127126
CLOUDSTACK_SSH_KEY_NAME: CAPCKeyPair6

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-worker-offering/kustomization.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-worker-offering/md.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

test/e2e/invalid_resource.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,10 @@ func InvalidResourceSpec(ctx context.Context, inputGetter func() CommonSpecInput
6969
testInvalidResource(ctx, input, "invalid-domain", "No match found for "+input.E2EConfig.GetVariable(InvalidDomainName))
7070
})
7171

72-
It("Should fail due to the specified control plane offering is not found [TC7a]", func() {
72+
It("Should fail due to the specified control plane offering is not found [TC7]", func() {
7373
testInvalidResource(ctx, input, "invalid-cp-offering", "No match found for "+input.E2EConfig.GetVariable(InvalidCPOfferingName))
7474
})
7575

76-
It("Should fail due to the specified worker offering is not found [TC7b]", func() {
77-
testInvalidResource(ctx, input, "invalid-worker-offering", "No match found for "+input.E2EConfig.GetVariable(InvalidWorkerOfferingName))
78-
})
79-
8076
It("Should fail due to the specified template is not found [TC6]", func() {
8177
testInvalidResource(ctx, input, "invalid-template", "No match found for "+input.E2EConfig.GetVariable(InvalidTemplateName))
8278
})

0 commit comments

Comments
 (0)