Skip to content

Commit

Permalink
Squashed 'release-tools/' changes from 335339f..aa61bfd0
Browse files Browse the repository at this point in the history
aa61bfd0 Merge pull request kubernetes-csi#218 from xing-yang/update_csi_driver
7563d196 Update CSI_PROW_DRIVER_VERSION to v1.11.0
a2171bef Merge pull request kubernetes-csi#216 from msau42/process
cb987826 Merge pull request kubernetes-csi#217 from msau42/owners
a11216e4 add new reviewers and remove inactive reviewers
dd986754 Add step for checking builds
b66c0824 Merge pull request kubernetes-csi#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 kubernetes-csi#208 from jsafrane/skip-selinux
36e433e2 Skip SELinux tests in CI by default
348d4a92 Merge pull request kubernetes-csi#207 from RaunakShah/reviewers
1efc2724 Merge pull request kubernetes-csi#206 from RaunakShah/update-prow
7d410d88 Changes to csi prow to run e2e tests in sidecars
cfa5a75c Merge pull request kubernetes-csi#203 from humblec/test-vendor
4edd1d8a Add RaunakShah to CSI reviewers group
7ccc9594 release tools update to 1.19
d24254f6 Merge pull request kubernetes-csi#202 from xing-yang/kind_0.14.0
0faa3fc7 Update to Kind v0.14.0 images
ef4e1b2b Merge pull request kubernetes-csi#201 from xing-yang/add_1.24_image
4ddce251 Add 1.24 Kind image
7fe51491 Merge pull request kubernetes-csi#200 from pohly/bump-kubernetes-version
70915a8e prow.sh: update snapshotter version
31a3f38b Merge pull request kubernetes-csi#199 from pohly/bump-kubernetes-version
7577454a prow.sh: bump Kubernetes to v1.22.0
d29a2e75 Merge pull request kubernetes-csi#198 from pohly/csi-test-5.0.0
41cb70d3 prow.sh: sanity testing with csi-test v5.0.0
c85a63fb Merge pull request kubernetes-csi#197 from pohly/fix-alpha-testing
b86d8e94 support Kubernetes 1.25 + Ginkgo v2
ab0b0a3d Merge pull request kubernetes-csi#192 from andyzhangx/patch-1
7bbab24e Merge pull request kubernetes-csi#196 from humblec/non-alpha
e51ff2cc introduce control variable for non alpha feature gate configuration
ca19ef52 Merge pull request kubernetes-csi#195 from pohly/fix-alpha-testing
3948331e fix testing with latest Kubernetes
e4dab7ff Merge pull request kubernetes-csi#194 from yselkowitz/registry-k8s-io
84a4d5a1 Move from k8s.gcr.io to registry.k8s.io
9a0260c5 fix boilerplate header
37d1104 Merge pull request kubernetes-csi#191 from pohly/go-1.18
db917f5 update to Go 1.18

git-subtree-dir: release-tools
git-subtree-split: aa61bfd0c1a80460aba7cb0feddc8cdee03622a4
  • Loading branch information
andyzhangx committed Feb 19, 2023
1 parent c4a0d90 commit 8256cb1
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 43 deletions.
5 changes: 4 additions & 1 deletion KUBERNETES_CSI_OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,19 @@ aliases:
- ggriffiths
- gnufied
- humblec
- mauriciopoppe
- j-griffith
- Jiawei0227
- jingxu97
- jsafrane
- pohly
- RaunakShah
- sunnylovestiramisu
- xing-yang

# This documents who previously contributed to Kubernetes-CSI
# as approver.
emeritus_approvers:
- Jiawei0227
- lpabon
- sbezverk
- vladimirvivien
2 changes: 2 additions & 0 deletions SIDECAR_RELEASE_PROCESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
1. Check that all [canary CI
jobs](https://k8s-testgrid.appspot.com/sig-storage-csi-ci) are passing,
and that test coverage is adequate for the changes that are going into the release.
1. Check that the post-\<sidecar\>-push-images builds are succeeding.
[Example](https://k8s-testgrid.appspot.com/sig-storage-image-build#post-external-snapshotter-push-images)
1. Make sure that no new PRs have merged in the meantime, and no PRs are in
flight and soon to be merged.
1. Create a new release following a previous release as a template. Be sure to select the correct
Expand Down
21 changes: 19 additions & 2 deletions filter-junit.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,18 @@ var (
)

/*
* TestSuite represents a JUnit file. Due to how encoding/xml works, we have
* TestResults represents a JUnit file. Due to how encoding/xml works, we have
* represent all fields that we want to be passed through. It's therefore
* not a complete solution, but good enough for Ginkgo + Spyglass.
*
* Before Kubernetes 1.25 and ginkgo v2, we directly had <testsuite> in the
* JUnit file. Now we get <testsuites> and inside it the <testsuite>.
*/
type TestResults struct {
XMLName string `xml:"testsuites"`
TestSuite TestSuite `xml:"testsuite"`
}

type TestSuite struct {
XMLName string `xml:"testsuite"`
TestCases []TestCase `xml:"testcase"`
Expand All @@ -48,6 +56,7 @@ type TestCase struct {
Name string `xml:"name,attr"`
Time string `xml:"time,attr"`
SystemOut string `xml:"system-out,omitempty"`
SystemErr string `xml:"system-err,omitempty"`
Failure string `xml:"failure,omitempty"`
Skipped SkipReason `xml:"skipped,omitempty"`
}
Expand Down Expand Up @@ -93,7 +102,15 @@ func main() {
}
}
if err := xml.Unmarshal(data, &junit); err != nil {
panic(err)
if err.Error() != "expected element type <testsuite> but have <testsuites>" {
panic(err)
}
// Fall back to Ginkgo v2 format.
var junitv2 TestResults
if err := xml.Unmarshal(data, &junitv2); err != nil {
panic(err)
}
junit.TestCases = append(junit.TestCases, junitv2.TestSuite.TestCases...)
}
}

Expand Down
2 changes: 1 addition & 1 deletion go-get-kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

# This script can be used while converting a repo from "dep" to "go mod"
# by calling it after "go mod init" or to update the Kubernetes packages
# in a repo that has already been converted. Only packages that are
Expand Down

0 comments on commit 8256cb1

Please sign in to comment.