Skip to content

Commit

Permalink
Merge pull request #3117 from chrischdi/pr-test-e2e-clusterclass-roll…
Browse files Browse the repository at this point in the history
…out-vcsim

🌱 test: enable vcsim for clusterclass rollout test
  • Loading branch information
k8s-ci-robot authored Jul 23, 2024
2 parents 030a53e + 697e984 commit 9ec3236
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion test/e2e/clusterclass_rollout_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/constants"
)

var _ = Describe("When testing ClusterClass rollouts [supervisor] [ClusterClass]", func() {
var _ = Describe("When testing ClusterClass rollouts [vcsim] [supervisor] [ClusterClass]", func() {
const specName = "clusterclass-rollouts" // copied from CAPI
Setup(specName, func(testSpecificSettingsGetter func() testSettings) {
capie2e.ClusterClassRolloutSpec(ctx, func() capie2e.ClusterClassRolloutSpecInput {
Expand Down
6 changes: 1 addition & 5 deletions test/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"path/filepath"
"strings"
"testing"
"time"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down Expand Up @@ -209,10 +208,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
vsphereframework.InitBootstrapCluster(ctx, bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)

if testTarget == VCSimTestTarget {
Byf("Creating a vcsim server")
Eventually(func() error {
return vspherevcsim.Create(ctx, bootstrapClusterProxy.GetClient())
}, time.Minute, 3*time.Second).ShouldNot(HaveOccurred(), "Failed to create VCenterSimulator")
createVCSimServer(bootstrapClusterProxy)
}

By("Getting AddressClaim labels")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,9 @@ func (r *vmBootstrapReconciler) reconcileBoostrapNode(ctx context.Context, clust
Status: corev1.NodeStatus{
Conditions: []corev1.NodeCondition{
{
Type: corev1.NodeReady,
Status: corev1.ConditionTrue,
LastTransitionTime: metav1.Now(),
Type: corev1.NodeReady,
Status: corev1.ConditionTrue,
},
},
},
Expand Down

0 comments on commit 9ec3236

Please sign in to comment.