Skip to content

Commit 6f8f7f5

Browse files
author
Daniel Gerber
committed
Make parallel execution the default but disableable
1 parent b237a96 commit 6f8f7f5

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

Tests/README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,11 @@ Install KaaS-specific requirements:
4949
pip install -r kaas/requirements.txt
5050
```
5151

52-
Given a kubeconfig file `path/to/kubeconfig.yaml`, run all tests in parallel with:
52+
Given a kubeconfig file `path/to/kubeconfig.yaml`, run all tests (in parallel) with:
5353

5454
```shell
5555
./scs-compliance-check.py -v -a kubeconfig=path/to/kubeconfig.yaml \
5656
-a subject_root=. \
57-
-a e2e-parallel="--e2e-parallel=true" \
5857
-s SUBJECT \
5958
-o report.yaml \
6059
scs-compatible-kaas.yaml
@@ -69,8 +68,7 @@ Additionally, the directory `sono-results` will be generated. It contains a JUni
6968
`plugins/e2e/results/global/junit_01.xml`. You can render it to HTML with a tool like junit2html.
7069
This might give you hints as to why a test failed.
7170

72-
If you need to run tests without parallelization simply remove `-a e2e-parallel="--e2e-parallel=true"`
73-
or set it to `false`.
71+
If you need to run tests without parallelization simply add `-a e2e-parallel="--e2e-parallel=false"`.
7472
Some additional information can be found [here](https://github.com/vmware-tanzu/sonobuoy/issues/1435).
7573

7674
## Usage information (help output)

Tests/scs-compliance-check.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def __init__(self):
9090
self.verbose = False
9191
self.quiet = False
9292
self.subject = ""
93-
self.assignment = {}
93+
self.assignment = { "e2e-parallel" : "--e2e-parallel=true" }
9494
self.checkdate = datetime.date.today()
9595
self.version = None
9696
self.output = None
@@ -135,7 +135,7 @@ def apply_argv(self, argv):
135135
self.critical_only = True
136136
elif opt[0] == "-a" or opt[0] == "--assign":
137137
key, value = opt[1].split("=", 1)
138-
if key in self.assignment:
138+
if key in self.assignment and key != "e2e-parallel":
139139
raise ValueError(f"Double assignment for {key!r}")
140140
self.assignment[key] = value
141141
elif opt[0] == "-t" or opt[0] == "--tests":

0 commit comments

Comments
 (0)