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.

Sign up for GitHub

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

Jump to bottom

Add release and slow jobs for Trusty stable #20664

Merged
merged 1 commit into from Feb 9, 2016
Merged

Add release and slow jobs for Trusty stable #20664

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 59 additions & 11 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Expand Up @@ -46,12 +46,14 @@ TRUSTY_IMAGE_PROJECT="${TRUSTY_IMAGE_PROJECT:-}"
function get_latest_trusty_image() {
local job_name="${1:-${JOB_NAME}}"
local image_index=""
if [[ "${job_name}" =~ trusty-dev ]]; then
if [[ "${job_name}" =~ trusty-head ]]; then
image_index="trusty-head"
elif [[ "${job_name}" =~ trusty-dev ]]; then
image_index="trusty-dev"
elif [[ "${job_name}" =~ trusty-beta ]]; then
image_index="trusty-beta"
elif [[ "${job_name}" =~ trusty ]]; then
image_index="trusty"
elif [[ "${job_name}" =~ trusty-stable ]]; then
image_index="trusty-stable"
fi
gsutil cat "gs://${TRUSTY_IMAGE_PROJECT}/image-indices/latest-test-image-${image_index}"
# Clean up gsutil artifacts otherwise the later test stage will complain.
Expand Down Expand Up @@ -407,7 +409,7 @@ TRUSTY_DEFAULT_SKIP_TESTS=(
"Services.*should\swork\safter\srestarting\skube-proxy"
)

TRUSTY_SKIP_TESTS=(
TRUSTY_HEAD_SKIP_TESTS=(
"${TRUSTY_DEFAULT_SKIP_TESTS[@]}"
)

Expand All @@ -419,6 +421,10 @@ TRUSTY_BETA_SKIP_TESTS=(
"${TRUSTY_DEFAULT_SKIP_TESTS[@]}"
)

TRUSTY_STABLE_SKIP_TESTS=(
"${TRUSTY_DEFAULT_SKIP_TESTS[@]}"
)

# Define environment variables based on the Jenkins project name.
# NOTE: Not all jobs are defined here. The hack/jenkins/e2e.sh in master and
# release branches defines relevant jobs for that particular version of
Expand Down Expand Up @@ -499,7 +505,7 @@ case ${JOB_NAME} in

# Runs non-flaky tests on GCE with Trusty as base image for minions,
# sequentially.
kubernetes-e2e-gce-trusty-release)
kubernetes-e2e-gce-trusty-head-release)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-trusty-release"}
: ${E2E_DOWN:="false"}
: ${E2E_NETWORK:="e2e-gce-trusty-release"}
Expand All @@ -508,7 +514,7 @@ case ${JOB_NAME} in
${GCE_RELEASE_SKIP_TESTS[@]:+${GCE_RELEASE_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
${TRUSTY_SKIP_TESTS[@]:+${TRUSTY_SKIP_TESTS[@]}} \
${TRUSTY_HEAD_SKIP_TESTS[@]:+${TRUSTY_HEAD_SKIP_TESTS[@]}} \
)"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"}
: ${PROJECT:="kubekins-e2e-gce-trusty-rls"}
Expand All @@ -519,14 +525,14 @@ case ${JOB_NAME} in
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
;;

# Runs slow tests on GCE with Trusy as base image for minions, sequentially.
kubernetes-e2e-gce-trusty-slow)
# Runs slow tests on GCE with Trusty as base image for minions, sequentially.
kubernetes-e2e-gce-trusty-head-slow)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-trusty-slow"}
: ${E2E_NETWORK:="e2e-gce-trusty-slow"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
) --ginkgo.skip=$(join_regex_allow_empty \
${TRUSTY_SKIP_TESTS[@]:+${TRUSTY_SKIP_TESTS[@]}} \
${TRUSTY_HEAD_SKIP_TESTS[@]:+${TRUSTY_HEAD_SKIP_TESTS[@]}} \
)"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-trusty-slow"}
: ${PROJECT:="k8s-e2e-gce-trusty-slow"}
Expand Down Expand Up @@ -560,7 +566,7 @@ case ${JOB_NAME} in
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
;;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, sorry about that. Updated.


# Runs slow tests on GCE with Trusy-dev as base image for minions,
# Runs slow tests on GCE with Trusty-dev as base image for minions,
# sequentially.
kubernetes-e2e-gce-trusty-dev-slow)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-trusty-dev-slow"}
Expand Down Expand Up @@ -602,7 +608,7 @@ case ${JOB_NAME} in
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
;;

# Runs slow tests on GCE with Trusy-beta as base image for minions,
# Runs slow tests on GCE with Trusty-beta as base image for minions,
# sequentially.
kubernetes-e2e-gce-trusty-beta-slow)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-trusty-beta-slow"}
Expand All @@ -622,6 +628,48 @@ case ${JOB_NAME} in
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
;;

# Runs non-flaky tests on GCE with Trusty-stable as base image for minions,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this comment say "Trusty-beta"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, no, the job name is wrong.

# sequentially.
kubernetes-e2e-gce-trusty-stable-release)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-trusty-stable-release"}
: ${E2E_DOWN:="false"}
: ${E2E_NETWORK:="e2e-gce-trusty-stable-release"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_RELEASE_SKIP_TESTS[@]:+${GCE_RELEASE_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
${TRUSTY_STABLE_SKIP_TESTS[@]:+${TRUSTY_STABLE_SKIP_TESTS[@]}} \
)"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"}
: ${PROJECT:="k8s-e2e-gce-trusty-stable"}
: ${KUBE_GCE_MINION_PROJECT:="${TRUSTY_IMAGE_PROJECT}"}
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
;;

# Runs slow tests on GCE with Trusty-stable as base image for minions,
# sequentially.
kubernetes-e2e-gce-trusty-stable-slow)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-trusty-stable-slow"}
: ${E2E_NETWORK:="e2e-gce-trusty-stable-slow"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
) --ginkgo.skip=$(join_regex_allow_empty \
${TRUSTY_BETA_SKIP_TESTS[@]:+${TRUSTY_BETA_SKIP_TESTS[@]}} \
)"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-trusty-stable-slow"}
: ${PROJECT:="k8s-e2e-gce-trusty-stable-slow"}
: ${KUBE_GCE_MINION_PROJECT:="${TRUSTY_IMAGE_PROJECT}"}
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
;;

# Runs non-flaky tests on GCE on the release candidate branch,
# sequentially. As a reminder, if you need to change the skip list
# or flaky test list on the release branch, you'll need to propose a
Expand Down