Merge pull request #24283 from andyzheng0831/e2e

Automatic merge from submit-queue Shorten cluster names in GKE Jenkins on Trusty We identified an issue that the PD tests in GKE Jenkins on Trusty fail because the PD name is longer than the limit of 63 characters. The PD name embeds the "E2E_NAME" env variable exported in the Jenkins job configuration. This PR shortens that string for all GKE Jenkins on Trusty. As a result, the PD name will meet the limit requirement.

Merge pull request #24283 from andyzheng0831/e2e
d01939e6 · k8s-merge-robot · 02a133e2 · b2b738ee · d01939e6
Commit d01939e6 authored Apr 19, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

kubernetes-e2e.yaml ...enkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml +6 -6

No files found.
--- a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml
+++ b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml
@@ -838,7 +838,7 @@
                export PROJECT="kubekins-e2e-gke-trusty-test"
                export CLOUDSDK_BUCKET="gs://cloud-sdk-testing/rc"
                export JENKINS_USE_SERVER_VERSION="y"
-                export E2E_NAME="jkns-gke-e2e-test-trusty"
+                export E2E_NAME="gke-e2e-test-trusty"
                export KUBE_OS_DISTRIBUTION="trusty"
        - 'gke-trusty-subnet':
            description: 'Run E2E tests on GKE test endpoint in a subnet.'
@@ -850,7 +850,7 @@
                export PROJECT="k8s-e2e-gke-trusty-subnet"
                export CLOUDSDK_BUCKET="gs://cloud-sdk-testing/rc"
                export JENKINS_USE_SERVER_VERSION="y"
-                export E2E_NAME="jkns-gke-e2e-subnet-trusty"
+                export E2E_NAME="gke-e2e-subnet-trusty"
                export KUBE_OS_DISTRIBUTION="trusty"
        - 'gke-trusty-staging':
            description: 'Run E2E tests on GKE staging endpoint.'
@@ -860,7 +860,7 @@
                export CLOUDSDK_BUCKET="gs://cloud-sdk-testing/rc"
                export JENKINS_USE_SERVER_VERSION="y"
                export CLOUDSDK_API_ENDPOINT_OVERRIDES_CONTAINER="https://staging-container.sandbox.googleapis.com/"
-                export E2E_NAME="jkns-gke-e2e-staging-trusty"
+                export E2E_NAME="gke-e2e-staging-trusty"
                export KUBE_OS_DISTRIBUTION="trusty"
        - 'gke-trusty-staging-parallel':
            description: 'Run E2E tests on GKE staging endpoint in parallel.'
@@ -872,7 +872,7 @@
                export CLOUDSDK_API_ENDPOINT_OVERRIDES_CONTAINER="https://staging-container.sandbox.googleapis.com/"
                export GINKGO_TEST_ARGS="--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"
                export GINKGO_PARALLEL="y"
-                export E2E_NAME="jkns-gke-e2e-staging-parallel-trusty"
+                export E2E_NAME="gke-e2e-staging-pa-trusty"
                export KUBE_OS_DISTRIBUTION="trusty"
        - 'gke-trusty-prod':
            # Failing constantly due to a known issue (tracked internally).
@@ -884,7 +884,7 @@
                export CLOUDSDK_BUCKET="gs://cloud-sdk-testing/rc"
                export JENKINS_USE_SERVER_VERSION="y"
                export KUBE_GCE_ZONE="asia-east1-b"
-                export E2E_NAME="jkns-gke-e2e-prod-trusty"
+                export E2E_NAME="gke-e2e-prod-trusty"
                export KUBE_OS_DISTRIBUTION="trusty"
        - 'gke-trusty-prod-parallel':
            # Failing constantly due to a known issue (tracked internally).
@@ -898,7 +898,7 @@
                export GINKGO_TEST_ARGS="--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"
                export GINKGO_PARALLEL="y"
                export KUBE_GCE_ZONE="asia-east1-b"
-                export E2E_NAME="jkns-gke-e2e-prod-parallel-trusty"
+                export E2E_NAME="gke-e2e-prod-pa-trusty"
                export KUBE_OS_DISTRIBUTION="trusty"
    jobs:
        - 'kubernetes-e2e-{suffix}'