Merge pull request #24535 from hakman/conformance_serial

kOps - Run conformance tests in serial mode
kubernetes · Dec 3, 2021 · c057c3a · c057c3a
2 parents 281e29a + 7971935
commit c057c3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
@@ -676,10 +676,12 @@ def generate_conformance():
                 kops_channel='alpha',
                 name_override=f"kops-aws-conformance-{version.replace('.', '-')}",
                 networking='calico',
+                test_parallelism=1,
+                test_timeout_minutes=120,
                 extra_dashboards=['kops-conformance'],
                 runs_per_day=1,
                 focus_regex=r'\[Conformance\]',
-                skip_regex=r'\[Flaky\]',
+                skip_regex=r'\[NoSkip\]',
             )
         )
     return results

diff --git a/config/jobs/kubernetes/kops/kops-periodics-conformance.yaml b/config/jobs/kubernetes/kops/kops-periodics-conformance.yaml
@@ -11,7 +11,7 @@ periodics:
     preset-aws-credential: "true"
   decorate: true
   decoration_config:
-    timeout: 90m
+    timeout: 150m
   extra_refs:
   - org: kubernetes
     repo: kops
@@ -37,11 +37,11 @@ periodics:
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
+          --test-args="-test.timeout=120m -num-nodes=0" \
           --test-package-marker=stable-1.22.txt \
           --focus-regex="\[Conformance\]" \
-          --skip-regex="\[Flaky\]" \
-          --parallel=25
+          --skip-regex="\[NoSkip\]" \
+          --parallel=1
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
@@ -77,7 +77,7 @@ periodics:
     preset-aws-credential: "true"
   decorate: true
   decoration_config:
-    timeout: 90m
+    timeout: 150m
   extra_refs:
   - org: kubernetes
     repo: kops
@@ -103,11 +103,11 @@ periodics:
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
+          --test-args="-test.timeout=120m -num-nodes=0" \
           --test-package-marker=stable-1.21.txt \
           --focus-regex="\[Conformance\]" \
-          --skip-regex="\[Flaky\]" \
-          --parallel=25
+          --skip-regex="\[NoSkip\]" \
+          --parallel=1
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private