Skip to content

Commit a4fa373

Browse files
pohlypohly
committed
Squashed 'release-tools/' changes from e4dab7f..d24254f
kubernetes-csi/csi-release-tools@d24254f Merge kubernetes-csi/csi-release-tools#202 from xing-yang/kind_0.14.0 kubernetes-csi/csi-release-tools@0faa3fc Update to Kind v0.14.0 images kubernetes-csi/csi-release-tools@ef4e1b2 Merge kubernetes-csi/csi-release-tools#201 from xing-yang/add_1.24_image kubernetes-csi/csi-release-tools@4ddce25 Add 1.24 Kind image kubernetes-csi/csi-release-tools@7fe5149 Merge kubernetes-csi/csi-release-tools#200 from pohly/bump-kubernetes-version kubernetes-csi/csi-release-tools@70915a8 prow.sh: update snapshotter version kubernetes-csi/csi-release-tools@31a3f38 Merge kubernetes-csi/csi-release-tools#199 from pohly/bump-kubernetes-version kubernetes-csi/csi-release-tools@7577454 prow.sh: bump Kubernetes to v1.22.0 kubernetes-csi/csi-release-tools@d29a2e7 Merge kubernetes-csi/csi-release-tools#198 from pohly/csi-test-5.0.0 kubernetes-csi/csi-release-tools@41cb70d prow.sh: sanity testing with csi-test v5.0.0 kubernetes-csi/csi-release-tools@c85a63f Merge kubernetes-csi/csi-release-tools#197 from pohly/fix-alpha-testing kubernetes-csi/csi-release-tools@b86d8e9 support Kubernetes 1.25 + Ginkgo v2 kubernetes-csi/csi-release-tools@ab0b0a3 Merge kubernetes-csi/csi-release-tools#192 from andyzhangx/patch-1 kubernetes-csi/csi-release-tools@7bbab24 Merge kubernetes-csi/csi-release-tools#196 from humblec/non-alpha kubernetes-csi/csi-release-tools@e51ff2c introduce control variable for non alpha feature gate configuration kubernetes-csi/csi-release-tools@ca19ef5 Merge kubernetes-csi/csi-release-tools#195 from pohly/fix-alpha-testing kubernetes-csi/csi-release-tools@3948331 fix testing with latest Kubernetes kubernetes-csi/csi-release-tools@9a0260c fix boilerplate header git-subtree-dir: release-tools git-subtree-split: d24254f6aa780bb6ba36a946973ee01df5633f6b
1 parent 35ec36a commit a4fa373

File tree

3 files changed

+53
-23
lines changed

3 files changed

+53
-23
lines changed

‎filter-junit.go

+18-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,18 @@ var (
3535
)
3636

3737
/*
38-
* TestSuite represents a JUnit file. Due to how encoding/xml works, we have
38+
* TestResults represents a JUnit file. Due to how encoding/xml works, we have
3939
* represent all fields that we want to be passed through. It's therefore
4040
* not a complete solution, but good enough for Ginkgo + Spyglass.
41+
*
42+
* Before Kubernetes 1.25 and ginkgo v2, we directly had <testsuite> in the
43+
* JUnit file. Now we get <testsuites> and inside it the <testsuite>.
4144
*/
45+
type TestResults struct {
46+
XMLName string `xml:"testsuites"`
47+
TestSuite TestSuite `xml:"testsuite"`
48+
}
49+
4250
type TestSuite struct {
4351
XMLName string `xml:"testsuite"`
4452
TestCases []TestCase `xml:"testcase"`
@@ -93,7 +101,15 @@ func main() {
93101
}
94102
}
95103
if err := xml.Unmarshal(data, &junit); err != nil {
96-
panic(err)
104+
if err.Error() != "expected element type <testsuite> but have <testsuites>" {
105+
panic(err)
106+
}
107+
// Fall back to Ginkgo v2 format.
108+
var junitv2 TestResults
109+
if err := xml.Unmarshal(data, &junitv2); err != nil {
110+
panic(err)
111+
}
112+
junit = junitv2.TestSuite
97113
}
98114
}
99115

‎go-get-kubernetes.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
16-
#
16+
1717
# This script can be used while converting a repo from "dep" to "go mod"
1818
# by calling it after "go mod init" or to update the Kubernetes packages
1919
# in a repo that has already been converted. Only packages that are

‎prow.sh

+34-20
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,10 @@ configvar CSI_PROW_GO_VERSION_KIND "${CSI_PROW_GO_VERSION_BUILD}" "Go version fo
9393
configvar CSI_PROW_GO_VERSION_GINKGO "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building ginkgo" # depends on CSI_PROW_GINKGO_VERSION below
9494

9595
# ginkgo test runner version to use. If the pre-installed version is
96-
# different, the desired version is built from source.
96+
# different, the desired version is built from source. For Kubernetes,
97+
# the version built via "make WHAT=vendor/github.com/onsi/ginkgo/ginkgo" is
98+
# used, which is guaranteed to match what the Kubernetes e2e.test binary
99+
# needs.
97100
configvar CSI_PROW_GINKGO_VERSION v1.7.0 "Ginkgo"
98101

99102
# Ginkgo runs the E2E test in parallel. The default is based on the number
@@ -118,7 +121,7 @@ configvar CSI_PROW_BUILD_JOB true "building code in repo enabled"
118121
# use the same settings as for "latest" Kubernetes. This works
119122
# as long as there are no breaking changes in Kubernetes, like
120123
# deprecating or changing the implementation of an alpha feature.
121-
configvar CSI_PROW_KUBERNETES_VERSION 1.17.0 "Kubernetes"
124+
configvar CSI_PROW_KUBERNETES_VERSION 1.22.0 "Kubernetes"
122125

123126
# CSI_PROW_KUBERNETES_VERSION reduced to first two version numbers and
124127
# with underscore (1_13 instead of 1.13.3) and in uppercase (LATEST
@@ -138,7 +141,7 @@ kind_version_default () {
138141
latest|master)
139142
echo main;;
140143
*)
141-
echo v0.11.1;;
144+
echo v0.14.0;;
142145
esac
143146
}
144147

@@ -149,16 +152,13 @@ configvar CSI_PROW_KIND_VERSION "$(kind_version_default)" "kind"
149152

150153
# kind images to use. Must match the kind version.
151154
# The release notes of each kind release list the supported images.
152-
configvar CSI_PROW_KIND_IMAGES "kindest/node:v1.23.0@sha256:49824ab1727c04e56a21a5d8372a402fcd32ea51ac96a2706a12af38934f81ac
153-
kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047
154-
kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
155-
kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9
156-
kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729
157-
kindest/node:v1.18.19@sha256:7af1492e19b3192a79f606e43c35fb741e520d195f96399284515f077b3b622c
158-
kindest/node:v1.17.17@sha256:66f1d0d91a88b8a001811e2f1054af60eef3b669a9a74f9b6db871f2f1eeed00
159-
kindest/node:v1.16.15@sha256:83067ed51bf2a3395b24687094e283a7c7c865ccc12a8b1d7aa673ba0c5e8861
160-
kindest/node:v1.15.12@sha256:b920920e1eda689d9936dfcf7332701e80be12566999152626b2c9d730397a95
161-
kindest/node:v1.14.10@sha256:f8a66ef82822ab4f7569e91a5bccaf27bceee135c1457c512e54de8c6f7219f8" "kind images"
155+
configvar CSI_PROW_KIND_IMAGES "kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
156+
kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
157+
kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105
158+
kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207
159+
kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
160+
kindest/node:v1.19.16@sha256:d9c819e8668de8d5030708e484a9fdff44d95ec4675d136ef0a0a584e587f65c
161+
kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fcdbd126188e6d7" "kind images"
162162

163163
# By default, this script tests sidecars with the CSI hostpath driver,
164164
# using the install_csi_driver function. That function depends on
@@ -196,7 +196,7 @@ kindest/node:v1.14.10@sha256:f8a66ef82822ab4f7569e91a5bccaf27bceee135c1457c512e5
196196
# If the deployment script is called with CSI_PROW_TEST_DRIVER=<file name> as
197197
# environment variable, then it must write a suitable test driver configuration
198198
# into that file in addition to installing the driver.
199-
configvar CSI_PROW_DRIVER_VERSION "v1.3.0" "CSI driver version"
199+
configvar CSI_PROW_DRIVER_VERSION "v1.8.0" "CSI driver version"
200200
configvar CSI_PROW_DRIVER_REPO https://github.com/kubernetes-csi/csi-driver-host-path "CSI driver repo"
201201
configvar CSI_PROW_DEPLOYMENT "" "deployment"
202202
configvar CSI_PROW_DEPLOYMENT_SUFFIX "" "additional suffix in kubernetes-x.yy[suffix].yaml files"
@@ -234,7 +234,7 @@ configvar CSI_PROW_E2E_IMPORT_PATH "k8s.io/kubernetes" "E2E package"
234234
# of the cluster. The alternative would have been to (cross-)compile csi-sanity
235235
# and install it inside the cluster, which is not necessarily easier.
236236
configvar CSI_PROW_SANITY_REPO https://github.com/kubernetes-csi/csi-test "csi-test repo"
237-
configvar CSI_PROW_SANITY_VERSION v4.3.0 "csi-test version"
237+
configvar CSI_PROW_SANITY_VERSION v5.0.0 "csi-test version"
238238
configvar CSI_PROW_SANITY_PACKAGE_PATH github.com/kubernetes-csi/csi-test "csi-test package"
239239
configvar CSI_PROW_SANITY_SERVICE "hostpath-service" "Kubernetes TCP service name that exposes csi.sock"
240240
configvar CSI_PROW_SANITY_POD "csi-hostpathplugin-0" "Kubernetes pod with CSI driver"
@@ -346,15 +346,18 @@ configvar CSI_PROW_E2E_ALPHA "$(get_versioned_variable CSI_PROW_E2E_ALPHA "${csi
346346
# kubernetes-csi components must be updated, either by disabling
347347
# the failing test for "latest" or by updating the test and not running
348348
# it anymore for older releases.
349-
configvar CSI_PROW_E2E_ALPHA_GATES_LATEST 'GenericEphemeralVolume=true,CSIStorageCapacity=true' "alpha feature gates for latest Kubernetes"
349+
configvar CSI_PROW_E2E_ALPHA_GATES_LATEST '' "alpha feature gates for latest Kubernetes"
350350
configvar CSI_PROW_E2E_ALPHA_GATES "$(get_versioned_variable CSI_PROW_E2E_ALPHA_GATES "${csi_prow_kubernetes_version_suffix}")" "alpha E2E feature gates"
351351

352+
configvar CSI_PROW_E2E_GATES_LATEST '' "non alpha feature gates for latest Kubernetes"
353+
configvar CSI_PROW_E2E_GATES "$(get_versioned_variable CSI_PROW_E2E_GATES "${csi_prow_kubernetes_version_suffix}")" "non alpha E2E feature gates"
354+
352355
# Which external-snapshotter tag to use for the snapshotter CRD and snapshot-controller deployment
353356
default_csi_snapshotter_version () {
354357
if [ "${CSI_PROW_KUBERNETES_VERSION}" = "latest" ] || [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ]; then
355358
echo "master"
356359
else
357-
echo "v3.0.2"
360+
echo "v4.0.0"
358361
fi
359362
}
360363
configvar CSI_SNAPSHOTTER_VERSION "$(default_csi_snapshotter_version)" "external-snapshotter version tag"
@@ -437,6 +440,10 @@ install_kind () {
437440

438441
# Ensure that we have the desired version of the ginkgo test runner.
439442
install_ginkgo () {
443+
if [ -e "${CSI_PROW_BIN}/ginkgo" ]; then
444+
return
445+
fi
446+
440447
# CSI_PROW_GINKGO_VERSION contains the tag with v prefix, the command line output does not.
441448
if [ "v$(ginkgo version 2>/dev/null | sed -e 's/.* //')" = "${CSI_PROW_GINKGO_VERSION}" ]; then
442449
return
@@ -940,7 +947,9 @@ install_e2e () {
940947
patch_kubernetes "${GOPATH}/src/${CSI_PROW_E2E_IMPORT_PATH}" "${CSI_PROW_WORK}" &&
941948
go_version="${CSI_PROW_GO_VERSION_E2E:-$(go_version_for_kubernetes "${GOPATH}/src/${CSI_PROW_E2E_IMPORT_PATH}" "${CSI_PROW_E2E_VERSION}")}" &&
942949
run_with_go "$go_version" make WHAT=test/e2e/e2e.test "-C${GOPATH}/src/${CSI_PROW_E2E_IMPORT_PATH}" &&
943-
ln -s "${GOPATH}/src/${CSI_PROW_E2E_IMPORT_PATH}/_output/bin/e2e.test" "${CSI_PROW_WORK}"
950+
ln -s "${GOPATH}/src/${CSI_PROW_E2E_IMPORT_PATH}/_output/bin/e2e.test" "${CSI_PROW_WORK}" &&
951+
run_with_go "$go_version" make WHAT=vendor/github.com/onsi/ginkgo/ginkgo "-C${GOPATH}/src/${CSI_PROW_E2E_IMPORT_PATH}" &&
952+
ln -s "${GOPATH}/src/${CSI_PROW_E2E_IMPORT_PATH}/_output/bin/ginkgo" "${CSI_PROW_BIN}"
944953
else
945954
run_with_go "${CSI_PROW_GO_VERSION_E2E}" go test -c -o "${CSI_PROW_WORK}/e2e.test" "${CSI_PROW_E2E_IMPORT_PATH}/test/e2e"
946955
fi
@@ -1254,7 +1263,8 @@ main () {
12541263
fi
12551264
12561265
if tests_need_non_alpha_cluster; then
1257-
start_cluster || die "starting the non-alpha cluster failed"
1266+
# Need to (re)create the cluster.
1267+
start_cluster "${CSI_PROW_E2E_GATES}" || die "starting the non-alpha cluster failed"
12581268
12591269
# Install necessary snapshot CRDs and snapshot controller
12601270
install_snapshot_crds
@@ -1304,7 +1314,11 @@ main () {
13041314
delete_cluster_inside_prow_job non-alpha
13051315
fi
13061316
1307-
if tests_need_alpha_cluster && [ "${CSI_PROW_E2E_ALPHA_GATES}" ]; then
1317+
# If the cluster for alpha tests doesn't need any feature gates, then we
1318+
# could reuse the same cluster as for the other tests. But that would make
1319+
# the flow in this script harder and wouldn't help in practice because
1320+
# we have separate Prow jobs for alpha and non-alpha tests.
1321+
if tests_need_alpha_cluster; then
13081322
# Need to (re)create the cluster.
13091323
start_cluster "${CSI_PROW_E2E_ALPHA_GATES}" || die "starting alpha cluster failed"
13101324

0 commit comments

Comments
 (0)