Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test against latest stable k8s in e2e kind test #4908

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ci/e2e_kind.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ pipeline {
echo "env.WORKSPACE: ${env.WORKSPACE}"
echo "GIT_REF: ${GIT_REF}"
echo "ARTIFACTS: ${ARTIFACTS}"
echo "KUBE_VERSION: $(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)"
}
}

Expand Down Expand Up @@ -209,6 +210,7 @@ pipeline {
export DELETE_NAMESPACE_ON_FAILURE=${params.DELETE_NAMESPACE_ON_FAILURE}
export ARTIFACTS=${ARTIFACTS}
export GINKGO_NO_COLOR=y
export KUBE_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
echo "info: begin to run e2e"
./hack/e2e.sh -- ${params.E2E_ARGS}
"""
Expand Down
4 changes: 2 additions & 2 deletions ci/pull_e2e_kind.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ try {
cat /etc/docker/daemon.json || true
E2E=y NO_BUILD=y DOCKER_REPO=hub.pingcap.net/tidb-operator-e2e IMAGE_TAG=${IMAGE_TAG} make docker-push e2e-docker-push
echo "info: download binaries for e2e"
E2E=y SKIP_BUILD=y SKIP_IMAGE_BUILD=y SKIP_UP=y SKIP_TEST=y SKIP_DOWN=y ./hack/e2e.sh
KUBE_VERSION=\$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt) E2E=y SKIP_BUILD=y SKIP_IMAGE_BUILD=y SKIP_UP=y SKIP_TEST=y SKIP_DOWN=y ./hack/e2e.sh
echo "info: change ownerships for jenkins"
# we run as root in our pods, this is required
# otherwise jenkins agent will fail because of the lack of permission
Expand All @@ -368,7 +368,7 @@ try {
}
}

def GLOBALS = "KIND_DATA_HOSTPATH=/kind-data KIND_ETCD_DATADIR=/mnt/tmpfs/etcd E2E=y SKIP_BUILD=y SKIP_IMAGE_BUILD=y DOCKER_REPO=hub.pingcap.net/tidb-operator-e2e IMAGE_TAG=${IMAGE_TAG} DELETE_NAMESPACE_ON_FAILURE=${params.DELETE_NAMESPACE_ON_FAILURE} GINKGO_NO_COLOR=y"
def GLOBALS = "KUBE_VERSION=\$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt) KIND_DATA_HOSTPATH=/kind-data KIND_ETCD_DATADIR=/mnt/tmpfs/etcd E2E=y SKIP_BUILD=y SKIP_IMAGE_BUILD=y DOCKER_REPO=hub.pingcap.net/tidb-operator-e2e IMAGE_TAG=${IMAGE_TAG} DELETE_NAMESPACE_ON_FAILURE=${params.DELETE_NAMESPACE_ON_FAILURE} GINKGO_NO_COLOR=y"
build("tidb-operator", "${GLOBALS} GINKGO_NODES=${params.GINKGO_NODES} ./hack/e2e.sh -- ${params.E2E_ARGS}")

if (GIT_REF ==~ /^(master|)$/ || GIT_REF ==~ /^(release-.*)$/
Expand Down