revert timeout increase, disable ssh tests

Azure · Oct 6, 2020 · 4de0f53 · 4de0f53
1 parent 8c0595f
commit 4de0f53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.pipelines/e2e-job-template.yaml b/.pipelines/e2e-job-template.yaml
@@ -9,7 +9,7 @@ parameters:
 jobs:
 - job: ${{ parameters.name }}
   dependsOn: unit_tests
-  timeoutInMinutes: 180
+  timeoutInMinutes: 150
   cancelTimeoutInMinutes: 5
   strategy:
     maxParallel: 0
@@ -35,6 +35,7 @@ jobs:
     SUBSCRIPTION_ID: '$(SUBSCRIPTION_ID_E2E_KUBERNETES)'
     MSI_USER_ASSIGNED_ID: '$(MSI_USER_ASSIGNED_ID_AKS_ENGINE_E2E)'
     CONTAINER_RUNTIME: ${{ parameters.containerRuntime }}
+    BLOCK_SSH: ${{ parameters.runSSHTests }}
 
   steps:
     - template: e2e-step-template.yaml

diff --git a/.pipelines/pr-e2e.yaml b/.pipelines/pr-e2e.yaml
@@ -66,6 +66,7 @@ jobs:
     createVNET: true
     enableKMSEncryption: false
     containerRuntime: 'docker'
+    runSSHTests: true
 
 - template: e2e-job-template.yaml
   parameters:
@@ -75,6 +76,7 @@ jobs:
     createVNET: true
     enableKMSEncryption: false
     containerRuntime: 'docker'
+    runSSHTests: true
 
 - template: e2e-job-template.yaml
   parameters:
@@ -84,6 +86,7 @@ jobs:
     createVNET: true
     enableKMSEncryption: false
     containerRuntime: 'containerd'
+    runSSHTests: false
 
 - template: e2e-job-template.yaml
   parameters:
@@ -93,3 +96,4 @@ jobs:
     createVNET: true
     enableKMSEncryption: false
     containerRuntime: 'containerd'
+    runSSHTests: false