Skip to content

Commit 76db306

Browse files
committed
Squashed 'release-tools/' changes from ad83def..f325590
kubernetes-csi/csi-release-tools@f3255906 Merge kubernetes-csi/csi-release-tools#149 from pohly/cluster-logs kubernetes-csi/csi-release-tools@4b03b308 Merge kubernetes-csi/csi-release-tools#155 from pohly/owners kubernetes-csi/csi-release-tools@a6453c86 owners: introduce aliases kubernetes-csi/csi-release-tools@feb20e26 prow.sh: collect cluster logs git-subtree-dir: release-tools git-subtree-split: f325590
1 parent ad7a8b6 commit 76db306

File tree

4 files changed

+54
-7
lines changed

4 files changed

+54
-7
lines changed

KUBERNETES_CSI_OWNERS_ALIASES

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
2+
3+
aliases:
4+
5+
# SIG-Storage chairs and leads should always have approval rights in all repos.
6+
# Others may be added as needed here or in each repo.
7+
kubernetes-csi-approvers:
8+
- jsafrane
9+
- msau42
10+
- saad-ali
11+
- xing-yang
12+
13+
# Reviewers are automatically assigned to new PRs. The following
14+
# reviewers will be active in all repos. Other reviewers can be
15+
# added in each repo.
16+
#
17+
# Reviewers are encouraged to set the "Busy" flag in their GitHub status
18+
# when they are temporarily unable to review PRs.
19+
kubernetes-csi-reviewers:
20+
- andyzhangx
21+
- chrishenzie
22+
- ggriffiths
23+
- gnufied
24+
- j-griffith
25+
- Jiawei0227
26+
- jingxu97
27+
- jsafrane
28+
- pohly
29+
- xing-yang
30+
31+
# This documents who previously contributed to Kubernetes-CSI
32+
# as approver.
33+
emeritus_approver:
34+
- lpabon
35+
- sbezverk
36+
- vladimirvivien
37+
38+
# This documents who previously contributed to Kubernetes-CSI
39+
# as reviewer.
40+
emeritus_reviewer:
41+
- lpabon
42+
- saad-ali
43+
- sbezverk
44+
- vladimirvivien

OWNERS

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
22

33
approvers:
4-
- saad-ali
5-
- msau42
4+
- kubernetes-csi-approvers
65
- pohly
76

87
reviewers:
9-
- saad-ali
10-
- msau42
11-
- pohly
8+
- kubernetes-csi-reviewers

OWNERS_ALIASES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
KUBERNETES_CSI_OWNERS_ALIASES

prow.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,11 +635,16 @@ EOF
635635

636636
# Deletes kind cluster inside a prow job
637637
delete_cluster_inside_prow_job() {
638+
local name="$1"
639+
638640
# Inside a real Prow job it is better to clean up at runtime
639641
# instead of leaving that to the Prow job cleanup code
640642
# because the later sometimes times out (https://github.com/kubernetes-csi/csi-release-tools/issues/24#issuecomment-554765872).
643+
#
644+
# This is also a good time to collect logs.
641645
if [ "$JOB_NAME" ]; then
642646
if kind get clusters | grep -q csi-prow; then
647+
run kind export logs --name=csi-prow "${ARTIFACTS}/cluster-logs/$name"
643648
run kind delete cluster --name=csi-prow || die "kind delete failed"
644649
fi
645650
unset KUBECONFIG
@@ -1274,7 +1279,7 @@ main () {
12741279
fi
12751280
fi
12761281
fi
1277-
delete_cluster_inside_prow_job
1282+
delete_cluster_inside_prow_job non-alpha
12781283
fi
12791284
12801285
if tests_need_alpha_cluster && [ "${CSI_PROW_E2E_ALPHA_GATES}" ]; then
@@ -1309,7 +1314,7 @@ main () {
13091314
fi
13101315
fi
13111316
fi
1312-
delete_cluster_inside_prow_job
1317+
delete_cluster_inside_prow_job alpha
13131318
fi
13141319
fi
13151320

0 commit comments

Comments
 (0)