Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit ca5524a

Browse files
committed
test: add Kubernetes 1.25
It replaces 1.24 as the default.
1 parent 7dd3633 commit ca5524a

16 files changed

+6144
-6
lines changed

Jenkinsfile

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ pipeline {
189189
// (more tests, runs longer, thus gets to use the existing worker)
190190
stage('Testing') {
191191
parallel {
192-
stage('1.24') {
192+
stage('1.25') {
193193
steps {
194194
// Skip production, i.e. run testing.
195-
TestInVM("", "", "fedora", "", "1.24", "Top.Level..[[:alpha:]]*-production[[:space:]]", "")
195+
TestInVM("", "", "fedora", "", "1.25", "Top.Level..[[:alpha:]]*-production[[:space:]]", "")
196196
}
197197
}
198198

199199
// When adding or removing coverage workers, update the "Code Coverage" step below!
200-
stage('coverage-1.24') {
200+
stage('coverage-1.25') {
201201
when {
202202
beforeAgent true
203203
not { changeRequest() }
@@ -206,11 +206,23 @@ pipeline {
206206
label "pmem-csi"
207207
}
208208
steps {
209-
TestInVM("fedora-coverage-1.24", "coverage-", "fedora", "", "1.24", "", "${env.COVERAGE_SKIP}")
209+
TestInVM("fedora-coverage-1.25", "coverage-", "fedora", "", "1.25", "", "${env.COVERAGE_SKIP}")
210210
}
211211
}
212212

213213
// All others set up their own worker.
214+
stage('1.24') {
215+
when {
216+
beforeAgent true
217+
not { changeRequest() }
218+
}
219+
agent {
220+
label "pmem-csi"
221+
}
222+
steps {
223+
TestInVM("fedora-1.24", "", "fedora", "", "1.24", "", "")
224+
}
225+
}
214226
stage('1.23') {
215227
when {
216228
beforeAgent true
@@ -334,7 +346,7 @@ git push origin HEAD:master
334346
}
335347
steps {
336348
// Restore <cluster>-coverage.out files.
337-
unstash '1.24-coverage'
349+
unstash '1.25-coverage'
338350
unstash '1.21-coverage'
339351

340352
// Merge and convert to Cobertura XML.

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ KUSTOMIZE_KUBERNETES_VERSIONS = \
183183
1.22 \
184184
1.23 \
185185
1.24 \
186+
1.25 \
186187

187188
KUSTOMIZE += $(foreach version,$(KUSTOMIZE_KUBERNETES_VERSIONS),$(subst X.XX,$(version),$(KUSTOMIZE_KUBERNETES_OUTPUT)))
188189

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
resources: [ pmem-csi.yaml ]

0 commit comments

Comments
 (0)