Merge pull request #2932 from fejta/timeout

Ensure federation jobs have valid timeouts
kubernetes · Jun 1, 2017 · 0c56d2c · 0c56d2c
2 parents e6a194a + 1251b2a
commit 0c56d2c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/jenkins/bootstrap_test.py b/jenkins/bootstrap_test.py
@@ -1859,6 +1859,7 @@ def testValidTimeout(self):
                 'kubernetes-e2e-',
                 'kubernetes-kubemark-',
                 'kubernetes-soak-',
+                'kubernetes-federation-e2e-',
                 'kops-e2e-',
             ]
 

diff --git a/jenkins/dockerized-e2e-runner.sh b/jenkins/dockerized-e2e-runner.sh
@@ -76,8 +76,8 @@ fi
 # which will happen during a timeout.
 CONTAINER_NAME="${JOB_NAME}-${BUILD_NUMBER}"
 
-echo 'ERROR: dockerized-e2e-runner.sh is deprecated' > &1
-echo 'ERROR: migrate this job to jobs/config.json and bootstrap.py --json=1 immediately' > &1
+echo 'ERROR: dockerized-e2e-runner.sh is deprecated' >&2
+echo 'ERROR: migrate this job to jobs/config.json and bootstrap.py --json=1 immediately' >&2
 echo "Starting..."
 timeout -s KILL ${DOCKER_TIMEOUT:-60m} docker run --rm \
   --name="${CONTAINER_NAME}" \

diff --git a/prow/config.yaml b/prow/config.yaml
@@ -271,7 +271,7 @@ presubmits:
         - --git-cache=/root/.cache/git
         - --clean
         - --json
-        - --timeout=90
+        - --timeout=110
         env:
         - name: GOOGLE_APPLICATION_CREDENTIALS
           value: /etc/service-account/service-account.json
@@ -552,7 +552,7 @@ presubmits:
         - --git-cache=/root/.cache/git
         - --clean
         - --json
-        - --timeout=90
+        - --timeout=110
         env:
         - name: GOOGLE_APPLICATION_CREDENTIALS
           value: /etc/service-account/service-account.json