From f7b674533cada86dc472340a2380b62f9f0da91e Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Fri, 8 Apr 2016 14:22:02 -0700 Subject: [PATCH] Start running [Serial] tests in Trusty CI jobs and the release job of Trusty-dev --- .../kubernetes-jenkins/kubernetes-e2e.yaml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml index 6a76e0fd01d..e043c5d6def 100644 --- a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml @@ -645,6 +645,13 @@ --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]" export GINKGO_PARALLEL="y" export PROJECT="e2e-gce-trusty-ci-master-slow" + - 'serial-master': + description: 'Run [Serial], [Disruptive], tests on GCE, with Trusty images.' + timeout: 300 + job-env: | + export GINKGO_TEST_ARGS="--ginkgo.focus=\[Serial\]|\[Disruptive\] \ + --ginkgo.skip=\[Flaky\]|\[Feature:.+\]" + export PROJECT="e2e-gce-trusty-ci-serial" jobs: - 'kubernetes-e2e-gce-trusty-ci-{suffix}' @@ -675,6 +682,13 @@ --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]" export GINKGO_PARALLEL="y" export PROJECT="e2e-gce-trusty-ci-slow-1-2" + - 'serial-release-1.2': + description: 'Run [Serial], [Disruptive], tests on GCE, with Trusty images, on the release-1.2 branch.' + timeout: 300 + job-env: | + export GINKGO_TEST_ARGS="--ginkgo.focus=\[Serial\]|\[Disruptive\] \ + --ginkgo.skip=\[Flaky\]|\[Feature:.+\]" + export PROJECT="e2e-gce-trusty-ci-serial-1-2" jobs: - 'kubernetes-e2e-gce-trusty-ci-{suffix}' @@ -722,6 +736,13 @@ --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]" export GINKGO_PARALLEL="y" export PROJECT="k8s-e2e-gce-trusty-dev-slow" + - 'serial': + description: 'Run [Serial], [Disruptive], tests on GCE, with Trusty dev images and the latest k8s 1.2 release.' + timeout: 300 + job-env: | + export GINKGO_TEST_ARGS="--ginkgo.focus=\[Serial\]|\[Disruptive\] \ + --ginkgo.skip=\[Flaky\]|\[Feature:.+\]" + export PROJECT="e2e-gce-trusty-dev-serial" jobs: - 'kubernetes-e2e-gce-trusty-dev-{suffix}'