Skip to content

Commit a1a2216

Browse files
zhanggbjzhanggbj
authored
Merge pull request #1584 from zhanggbj/bump_e2e
Bump CI to use release 1.34.0
2 parents b654232 + 0754c52 commit a1a2216

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎.github/dependabot.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ updates:
7777
# release branch N
7878
# ##################
7979
# GitHub Actions
80-
- target-branch: release-1.33
80+
- target-branch: release-1.34
8181
package-ecosystem: "github-actions"
8282
directory: "/"
8383
schedule:
8484
interval: "weekly"
8585
commit-message:
86-
prefix: ":seedling: (chore)[release-1.33]"
86+
prefix: ":seedling: (chore)[release-1.34]"
8787
labels:
8888
- "ok-to-test"
8989
- "area/ci"
@@ -97,7 +97,7 @@ updates:
9797
- "version-update:semver-minor"
9898

9999
# Main Go module
100-
- target-branch: release-1.33
100+
- target-branch: release-1.34
101101
package-ecosystem: "gomod"
102102
directory: "/"
103103
schedule:
@@ -108,7 +108,7 @@ updates:
108108
kubernetes:
109109
patterns: [ "k8s.io/*" ]
110110
commit-message:
111-
prefix: ":seedling: (chore)[release-1.33]"
111+
prefix: ":seedling: (chore)[release-1.34]"
112112
labels:
113113
- "ok-to-test"
114114
open-pull-requests-limit: 5
@@ -119,13 +119,13 @@ updates:
119119
- "version-update:semver-minor"
120120

121121
## Update dockerfile
122-
- target-branch: release-1.33
122+
- target-branch: release-1.34
123123
package-ecosystem: docker
124124
directory: "/cluster/images/controller-manager"
125125
schedule:
126126
interval: weekly
127127
commit-message:
128-
prefix: ":seedling: (chore)[release-1.33]"
128+
prefix: ":seedling: (chore)[release-1.34]"
129129
labels:
130130
- "ok-to-test"
131131
ignore:
@@ -138,7 +138,7 @@ updates:
138138
patterns: [ "*" ]
139139

140140
# Test Go module
141-
- target-branch: release-1.33
141+
- target-branch: release-1.34
142142
package-ecosystem: "gomod"
143143
directory: "/test/e2e"
144144
schedule:
@@ -153,7 +153,7 @@ updates:
153153
onsi:
154154
patterns: [ "github.com/onsi/*" ]
155155
commit-message:
156-
prefix: ":seedling: (chore)[release-1.33]"
156+
prefix: ":seedling: (chore)[release-1.34]"
157157
labels:
158158
- "ok-to-test"
159159
ignore:
@@ -166,13 +166,13 @@ updates:
166166
# release branch N-1
167167
# ################
168168
# GitHub Actions
169-
- target-branch: release-1.32
169+
- target-branch: release-1.33
170170
package-ecosystem: "github-actions"
171171
directory: "/"
172172
schedule:
173173
interval: "weekly"
174174
commit-message:
175-
prefix: ":seedling: (chore)[release-1.32]"
175+
prefix: ":seedling: (chore)[release-1.33]"
176176
labels:
177177
- "ok-to-test"
178178
- "area/ci"
@@ -186,7 +186,7 @@ updates:
186186
- "version-update:semver-minor"
187187

188188
# Main Go module
189-
- target-branch: release-1.32
189+
- target-branch: release-1.33
190190
package-ecosystem: "gomod"
191191
directory: "/"
192192
schedule:
@@ -197,7 +197,7 @@ updates:
197197
kubernetes:
198198
patterns: [ "k8s.io/*" ]
199199
commit-message:
200-
prefix: ":seedling: (chore)[release-1.32]"
200+
prefix: ":seedling: (chore)[release-1.33]"
201201
labels:
202202
- "ok-to-test"
203203
open-pull-requests-limit: 5
@@ -208,13 +208,13 @@ updates:
208208
- "version-update:semver-minor"
209209

210210
## Update dockerfile
211-
- target-branch: release-1.32
211+
- target-branch: release-1.33
212212
package-ecosystem: docker
213213
directory: "/cluster/images/controller-manager"
214214
schedule:
215215
interval: weekly
216216
commit-message:
217-
prefix: ":seedling: (chore)[release-1.32]"
217+
prefix: ":seedling: (chore)[release-1.33]"
218218
labels:
219219
- "ok-to-test"
220220
ignore:
@@ -227,7 +227,7 @@ updates:
227227
patterns: [ "*" ]
228228

229229
# Test Go module
230-
- target-branch: release-1.32
230+
- target-branch: release-1.33
231231
package-ecosystem: "gomod"
232232
directory: "/test/e2e"
233233
schedule:
@@ -242,7 +242,7 @@ updates:
242242
onsi:
243243
patterns: [ "github.com/onsi/*" ]
244244
commit-message:
245-
prefix: ":seedling: (chore)[release-1.32]"
245+
prefix: ":seedling: (chore)[release-1.33]"
246246
labels:
247247
- "ok-to-test"
248248
ignore:
@@ -255,13 +255,13 @@ updates:
255255
# release branch N-2
256256
# ##################
257257
# GitHub Actions
258-
- target-branch: release-1.31
258+
- target-branch: release-1.32
259259
package-ecosystem: "github-actions"
260260
directory: "/"
261261
schedule:
262262
interval: "weekly"
263263
commit-message:
264-
prefix: ":seedling: (chore)[release-1.31]"
264+
prefix: ":seedling: (chore)[release-1.32]"
265265
labels:
266266
- "ok-to-test"
267267
- "area/ci"
@@ -275,7 +275,7 @@ updates:
275275
- "version-update:semver-minor"
276276

277277
# Main Go module
278-
- target-branch: release-1.31
278+
- target-branch: release-1.32
279279
package-ecosystem: "gomod"
280280
directory: "/"
281281
schedule:
@@ -286,7 +286,7 @@ updates:
286286
kubernetes:
287287
patterns: [ "k8s.io/*" ]
288288
commit-message:
289-
prefix: ":seedling: (chore)[release-1.31]"
289+
prefix: ":seedling: (chore)[release-1.32]"
290290
labels:
291291
- "ok-to-test"
292292
open-pull-requests-limit: 5
@@ -297,13 +297,13 @@ updates:
297297
- "version-update:semver-minor"
298298

299299
## Update dockerfile
300-
- target-branch: release-1.31
300+
- target-branch: release-1.32
301301
package-ecosystem: docker
302302
directory: "/cluster/images/controller-manager"
303303
schedule:
304304
interval: weekly
305305
commit-message:
306-
prefix: ":seedling: (chore)[release-1.31]"
306+
prefix: ":seedling: (chore)[release-1.32]"
307307
labels:
308308
- "ok-to-test"
309309
ignore:
@@ -316,7 +316,7 @@ updates:
316316
patterns: [ "*" ]
317317

318318
# Test Go module
319-
- target-branch: release-1.31
319+
- target-branch: release-1.32
320320
package-ecosystem: "gomod"
321321
directory: "/test/e2e"
322322
schedule:
@@ -331,7 +331,7 @@ updates:
331331
onsi:
332332
patterns: [ "github.com/onsi/*" ]
333333
commit-message:
334-
prefix: ":seedling: (chore)[release-1.31]"
334+
prefix: ":seedling: (chore)[release-1.32]"
335335
labels:
336336
- "ok-to-test"
337337
ignore:

‎.github/workflows/weekly-security-scan.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
branch: [ master, release-1.33, release-1.32, release-1.31 ]
16+
branch: [ master, release-1.34, release-1.33, release-1.32 ]
1717
name: Trivy
1818
runs-on: ubuntu-latest
1919
steps:

‎test/e2e/config/vsphere-ci.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ providers:
6565
- sourcePath: "../data/shared/capv/main/metadata.yaml"
6666

6767
variables:
68-
KUBERNETES_VERSION: "v1.33.0"
68+
KUBERNETES_VERSION: "v1.34.0"
6969
#! KUBERNETES_VERSION_LATEST_CI can have the following formats:
7070
#! * v1.28.0 => will return the same version for convenience
7171
#! * stable-1.28 => will return the latest patch release for v1.28, e.g. v1.28.5
7272
#! * ci/latest-1.28 => will return the latest built version from the release branch, e.g. v1.28.5-26+72feddd3acde14
7373
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.34"
74-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.32.0"
75-
KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0"
76-
CPI_IMAGE_K8S_VERSION: "v1.33.0"
74+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.33.0"
75+
KUBERNETES_VERSION_UPGRADE_TO: "v1.34.0"
76+
CPI_IMAGE_K8S_VERSION: "v1.34.0"
7777
CNI: "./data/cni/calico/calico.yaml"
7878
EXP_CLUSTER_RESOURCE_SET: "true"
7979
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
@@ -89,8 +89,8 @@ variables:
8989
VSPHERE_DATASTORE: "vsanDatastore"
9090
VSPHERE_STORAGE_POLICY: "vSAN Default Storage Policy"
9191
VSPHERE_NETWORK: "k8s-ci"
92-
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
93-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.0"
92+
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.34.0"
93+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4230.2.2-kube-v1.34.0"
9494
VSPHERE_INSECURE_CSI: "true"
9595
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
9696
NODE_DRAIN_TIMEOUT: "60s"

‎test/e2e/e2e_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,9 @@ var _ = SynchronizedBeforeSuite(func() []byte {
278278

279279
// Capture the output (stdout and stderr)
280280
output, err := cmd.CombinedOutput()
281+
klog.Infof("Command output: %s\n", string(output))
281282
Expect(err).NotTo(HaveOccurred())
282283

283-
klog.Infof("Command output: %s\n", string(output))
284284
})
285285

286286
By("Watching vsphere-cpi daemonset logs", func() {

0 commit comments

Comments
 (0)