File tree Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -367,10 +367,17 @@ variables:
367
367
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
368
368
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
369
369
# This avoids building node images in the default case which improves the test duration significantly.
370
+ <<<<<<< HEAD
370
371
KUBERNETES_VERSION_MANAGEMENT : " v1.34.0-beta.0"
371
372
KUBERNETES_VERSION : " v1.34.0-beta.0"
372
373
KUBERNETES_VERSION_UPGRADE_FROM : " v1.33.1"
373
374
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)
374
381
KUBERNETES_VERSION_LATEST_CI : " ci/latest-1.34"
375
382
ETCD_VERSION_UPGRADE_TO : " 3.6.1"
376
383
COREDNS_VERSION_UPGRADE_TO : " v1.12.1"
Original file line number Diff line number Diff line change @@ -159,7 +159,7 @@ var _ = Describe("When following the Cluster API quick-start with dualstack and
159
159
SkipCleanup : skipCleanup ,
160
160
Flavor : ptr .To ("topology-dualstack-ipv4-primary" ),
161
161
PostMachinesProvisioned : func (proxy framework.ClusterProxy , namespace , clusterName string ) {
162
- By ("Running kubetest dualstack tests" )
162
+ By ("Running kubetest dualstack tests gke " )
163
163
// Start running the dualstack test suite from kubetest.
164
164
Expect (kubetest .Run (
165
165
ctx ,
You can’t perform that action at this time.
0 commit comments