Skip to content

Commit 56dab18

Browse files
committed
kubernetes-csi: pass directory to test against via env variable
The pull-test.sh script should be told where to find the additional source code repo instead of having to guess.
1 parent 9022f2a commit 56dab18

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ presubmits:
6060
args:
6161
- ./pull-test.sh # provided by csi-release-tools
6262
env:
63-
# We pick some version for which there are pre-built images for kind.
64-
# Update only when the newer version is known to not cause issues,
65-
# otherwise presubmit jobs may start to fail for reasons that are
66-
# unrelated to the PR. Testing against the latest Kubernetes is covered
67-
# by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
6863
- name: CSI_PROW_KUBERNETES_VERSION
6964
value: "1.20.0"
7065
- name: CSI_PROW_USE_BAZEL
@@ -77,6 +72,8 @@ presubmits:
7772
value: "v4.0.0"
7873
- name: CSI_PROW_TESTS
7974
value: "unit sanity parallel"
75+
- name: PULL_TEST_REPO_DIR
76+
value: /home/prow/go/src/github.com/kubernetes-csi/csi-test
8077
# docker-in-docker needs privileged mode
8178
securityContext:
8279
privileged: true
@@ -111,11 +108,6 @@ presubmits:
111108
args:
112109
- ./pull-test.sh # provided by csi-release-tools
113110
env:
114-
# We pick some version for which there are pre-built images for kind.
115-
# Update only when the newer version is known to not cause issues,
116-
# otherwise presubmit jobs may start to fail for reasons that are
117-
# unrelated to the PR. Testing against the latest Kubernetes is covered
118-
# by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
119111
- name: CSI_PROW_KUBERNETES_VERSION
120112
value: "1.20.0"
121113
- name: CSI_PROW_USE_BAZEL
@@ -128,6 +120,8 @@ presubmits:
128120
value: "v4.0.0"
129121
- name: CSI_PROW_TESTS
130122
value: "unit sanity parallel"
123+
- name: PULL_TEST_REPO_DIR
124+
value: /home/prow/go/src/github.com/kubernetes-csi/external-provisioner
131125
# docker-in-docker needs privileged mode
132126
securityContext:
133127
privileged: true
@@ -162,11 +156,6 @@ presubmits:
162156
args:
163157
- ./pull-test.sh # provided by csi-release-tools
164158
env:
165-
# We pick some version for which there are pre-built images for kind.
166-
# Update only when the newer version is known to not cause issues,
167-
# otherwise presubmit jobs may start to fail for reasons that are
168-
# unrelated to the PR. Testing against the latest Kubernetes is covered
169-
# by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
170159
- name: CSI_PROW_KUBERNETES_VERSION
171160
value: "1.20.0"
172161
- name: CSI_PROW_USE_BAZEL
@@ -179,6 +168,8 @@ presubmits:
179168
value: "v4.0.0"
180169
- name: CSI_PROW_TESTS
181170
value: "unit sanity parallel"
171+
- name: PULL_TEST_REPO_DIR
172+
value: /home/prow/go/src/github.com/kubernetes-csi/external-snapshotter
182173
# docker-in-docker needs privileged mode
183174
securityContext:
184175
privileged: true

config/jobs/kubernetes-csi/gen-jobs.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -745,11 +745,6 @@ for repo in $csi_release_tools_repos; do
745745
args:
746746
- ./pull-test.sh # provided by csi-release-tools
747747
env:
748-
# We pick some version for which there are pre-built images for kind.
749-
# Update only when the newer version is known to not cause issues,
750-
# otherwise presubmit jobs may start to fail for reasons that are
751-
# unrelated to the PR. Testing against the latest Kubernetes is covered
752-
# by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
753748
- name: CSI_PROW_KUBERNETES_VERSION
754749
value: "$latest_stable_k8s_version.0"
755750
- name: CSI_PROW_USE_BAZEL
@@ -762,6 +757,8 @@ for repo in $csi_release_tools_repos; do
762757
value: $(snapshotter_version "$latest_stable_k8s_version" "")
763758
- name: CSI_PROW_TESTS
764759
value: "unit sanity parallel"
760+
- name: PULL_TEST_REPO_DIR
761+
value: /home/prow/go/src/github.com/kubernetes-csi/$repo
765762
# docker-in-docker needs privileged mode
766763
securityContext:
767764
privileged: true

0 commit comments

Comments
 (0)