Skip to content

Commit

Permalink
Merge pull request #34079 from gnufied/revert-e2e-from-release-branch
Browse files Browse the repository at this point in the history
Revert building of e2e from release branches
  • Loading branch information
k8s-ci-robot authored Jan 6, 2025
2 parents 4c851c2 + 6c39103 commit d6c8807
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ presubmits:
# unrelated to the PR. Testing against the latest Kubernetes is covered
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.30"
value: "1.30.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.30"
- name: CSI_PROW_DEPLOYMENT_SUFFIX
Expand Down Expand Up @@ -131,7 +131,7 @@ presubmits:
# unrelated to the PR. Testing against the latest Kubernetes is covered
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.31"
value: "1.31.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.31"
- name: CSI_PROW_DEPLOYMENT_SUFFIX
Expand Down Expand Up @@ -229,7 +229,7 @@ presubmits:
# unrelated to the PR. Testing against the latest Kubernetes is covered
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.32"
value: "1.32.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.32"
- name: CSI_PROW_DEPLOYMENT_SUFFIX
Expand Down Expand Up @@ -327,7 +327,7 @@ presubmits:
# unrelated to the PR. Testing against the latest Kubernetes is covered
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.31"
value: "1.31.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.31"
- name: CSI_PROW_DEPLOYMENT_SUFFIX
Expand Down
16 changes: 1 addition & 15 deletions config/jobs/kubernetes-csi/gen-jobs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ pull_optional() {
local tests="$1"
local kubernetes="$2"
local deployment_suffix="$3"
local repo="$4"

# https://github.com/kubernetes-csi/csi-driver-host-path/pull/282 has not been merged yet,
# therefore pull jobs which depend on the new deployment flavors have to be optional.
Expand All @@ -285,19 +284,6 @@ pull_optional() {
fi
}

kubernetes_branch_name() {
local kubernetes="$1"
local repo="$2"
if [ "$repo" == "external-resizer" ]; then
# Since kubernetes tag from which e2e defaults to v1.xx.0 tags, we need to pull
# latest branch to get fixes we need for external-resizer. We will remove this workaround
# once we upgrade all sidecars to use a newer TAG.
echo "\"release-${kubernetes}\""
else
echo "\"${kubernetes}.0\""
fi
}

pull_alwaysrun() {
if [ "$1" != "alpha" ]; then
echo "true"
Expand Down Expand Up @@ -413,7 +399,7 @@ EOF
# unrelated to the PR. Testing against the latest Kubernetes is covered
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
- name: CSI_PROW_KUBERNETES_VERSION
value: $(kubernetes_branch_name "$kubernetes" "$repo")
value: "$kubernetes.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "$deployment"
- name: CSI_PROW_DEPLOYMENT_SUFFIX
Expand Down

0 comments on commit d6c8807

Please sign in to comment.