Skip to content

Commit d7407a7

Browse files
Test PR for testing on GKE cluster
Signed-off-by: Muhammad Adil Ghaffar <[email protected]>
1 parent 1cbe7e0 commit d7407a7

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

test/e2e/config/docker.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,17 @@ variables:
367367
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
368368
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
369369
# This avoids building node images in the default case which improves the test duration significantly.
370+
<<<<<<< HEAD
370371
KUBERNETES_VERSION_MANAGEMENT: "v1.34.0-beta.0"
371372
KUBERNETES_VERSION: "v1.34.0-beta.0"
372373
KUBERNETES_VERSION_UPGRADE_FROM: "v1.33.1"
373374
KUBERNETES_VERSION_UPGRADE_TO: "v1.34.0-beta.0"
375+
=======
376+
KUBERNETES_VERSION_MANAGEMENT: "ci/latest-1.34"
377+
KUBERNETES_VERSION: "ci/latest-1.34"
378+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.32.2"
379+
KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0"
380+
>>>>>>> 862f1f9f0 (Test PR for testing on GKE cluster)
374381
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.34"
375382
ETCD_VERSION_UPGRADE_TO: "3.6.1"
376383
COREDNS_VERSION_UPGRADE_TO: "v1.12.1"

test/e2e/quick_start_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ var _ = Describe("When following the Cluster API quick-start with dualstack and
159159
SkipCleanup: skipCleanup,
160160
Flavor: ptr.To("topology-dualstack-ipv4-primary"),
161161
PostMachinesProvisioned: func(proxy framework.ClusterProxy, namespace, clusterName string) {
162-
By("Running kubetest dualstack tests")
162+
By("Running kubetest dualstack tests gke")
163163
// Start running the dualstack test suite from kubetest.
164164
Expect(kubetest.Run(
165165
ctx,

0 commit comments

Comments
 (0)