Skip to content

Commit 8256cb1

Browse files
committed
Squashed 'release-tools/' changes from 335339f..aa61bfd0
aa61bfd0 Merge pull request #218 from xing-yang/update_csi_driver 7563d196 Update CSI_PROW_DRIVER_VERSION to v1.11.0 a2171bef Merge pull request #216 from msau42/process cb987826 Merge pull request #217 from msau42/owners a11216e4 add new reviewers and remove inactive reviewers dd986754 Add step for checking builds b66c0824 Merge pull request #214 from pohly/junit-fixes b9b6763b filter-junit.go: fix loss of testcases when parsing Ginkgo v2 JUnit d4277839 filter-junit.go: preserve system error log 38e11468 prow.sh: publish individual JUnit files as separate artifacts 78c0fb71 Merge pull request #208 from jsafrane/skip-selinux 36e433e2 Skip SELinux tests in CI by default 348d4a92 Merge pull request #207 from RaunakShah/reviewers 1efc2724 Merge pull request #206 from RaunakShah/update-prow 7d410d88 Changes to csi prow to run e2e tests in sidecars cfa5a75c Merge pull request #203 from humblec/test-vendor 4edd1d8a Add RaunakShah to CSI reviewers group 7ccc9594 release tools update to 1.19 d24254f6 Merge pull request #202 from xing-yang/kind_0.14.0 0faa3fc7 Update to Kind v0.14.0 images ef4e1b2b Merge pull request #201 from xing-yang/add_1.24_image 4ddce251 Add 1.24 Kind image 7fe51491 Merge pull request #200 from pohly/bump-kubernetes-version 70915a8e prow.sh: update snapshotter version 31a3f38b Merge pull request #199 from pohly/bump-kubernetes-version 7577454a prow.sh: bump Kubernetes to v1.22.0 d29a2e75 Merge pull request #198 from pohly/csi-test-5.0.0 41cb70d3 prow.sh: sanity testing with csi-test v5.0.0 c85a63fb Merge pull request #197 from pohly/fix-alpha-testing b86d8e94 support Kubernetes 1.25 + Ginkgo v2 ab0b0a3d Merge pull request #192 from andyzhangx/patch-1 7bbab24e Merge pull request #196 from humblec/non-alpha e51ff2cc introduce control variable for non alpha feature gate configuration ca19ef52 Merge pull request #195 from pohly/fix-alpha-testing 3948331e fix testing with latest Kubernetes e4dab7ff Merge pull request #194 from yselkowitz/registry-k8s-io 84a4d5a1 Move from k8s.gcr.io to registry.k8s.io 9a0260c5 fix boilerplate header 37d1104 Merge pull request #191 from pohly/go-1.18 db917f5 update to Go 1.18 git-subtree-dir: release-tools git-subtree-split: aa61bfd0c1a80460aba7cb0feddc8cdee03622a4
1 parent c4a0d90 commit 8256cb1

File tree

6 files changed

+111
-43
lines changed

6 files changed

+111
-43
lines changed

KUBERNETES_CSI_OWNERS_ALIASES

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,19 @@ aliases:
2222
- ggriffiths
2323
- gnufied
2424
- humblec
25+
- mauriciopoppe
2526
- j-griffith
26-
- Jiawei0227
2727
- jingxu97
2828
- jsafrane
2929
- pohly
30+
- RaunakShah
31+
- sunnylovestiramisu
3032
- xing-yang
3133

3234
# This documents who previously contributed to Kubernetes-CSI
3335
# as approver.
3436
emeritus_approvers:
37+
- Jiawei0227
3538
- lpabon
3639
- sbezverk
3740
- vladimirvivien

SIDECAR_RELEASE_PROCESS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
9292
1. Check that all [canary CI
9393
jobs](https://k8s-testgrid.appspot.com/sig-storage-csi-ci) are passing,
9494
and that test coverage is adequate for the changes that are going into the release.
95+
1. Check that the post-\<sidecar\>-push-images builds are succeeding.
96+
[Example](https://k8s-testgrid.appspot.com/sig-storage-image-build#post-external-snapshotter-push-images)
9597
1. Make sure that no new PRs have merged in the meantime, and no PRs are in
9698
flight and soon to be merged.
9799
1. Create a new release following a previous release as a template. Be sure to select the correct

filter-junit.go

Lines changed: 19 additions & 2 deletions
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"`
@@ -48,6 +56,7 @@ type TestCase struct {
4856
Name string `xml:"name,attr"`
4957
Time string `xml:"time,attr"`
5058
SystemOut string `xml:"system-out,omitempty"`
59+
SystemErr string `xml:"system-err,omitempty"`
5160
Failure string `xml:"failure,omitempty"`
5261
Skipped SkipReason `xml:"skipped,omitempty"`
5362
}
@@ -93,7 +102,15 @@ func main() {
93102
}
94103
}
95104
if err := xml.Unmarshal(data, &junit); err != nil {
96-
panic(err)
105+
if err.Error() != "expected element type <testsuite> but have <testsuites>" {
106+
panic(err)
107+
}
108+
// Fall back to Ginkgo v2 format.
109+
var junitv2 TestResults
110+
if err := xml.Unmarshal(data, &junitv2); err != nil {
111+
panic(err)
112+
}
113+
junit.TestCases = append(junit.TestCases, junitv2.TestSuite.TestCases...)
97114
}
98115
}
99116

go-get-kubernetes.sh

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)