MAAS

Merge ~adam-collard/maas:fewer-test-runners-ci into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. fewer-test-runners-ci
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 9394aa3e0ad9e9f104f309bfb9b3e8c836e985c1
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:fewer-test-runners-ci
Merge into: maas:master
Diff against target: 19 lines (+2/-2)
1 file modified
utilities/run-py-tests-ci (+2/-2)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Alberto Donato (community) Approve
Review via email: mp+431556@code.launchpad.net

Commit message

testing: allow for two free cores for e.g. postgresql

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fewer-test-runners-ci lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 8512a3368b93e938fc11b2705d9ce9757cbfac6c

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fewer-test-runners-ci lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1026/consoleText
COMMIT: 21e5f05be095191290064cb8e46ca1a05934feb5

review: Needs Fixing
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fewer-test-runners-ci lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 2e13229dabf7e16cf528f8e4c828e8cf98805d01

review: Approve
~adam-collard/maas:fewer-test-runners-ci updated
9394aa3... by Adam Collard

Simplify to --maxprocesses=6 and -n auto

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fewer-test-runners-ci lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 4e7e026cfd1e81d1c9dd65b8e1af158d99688a2c

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fewer-test-runners-ci lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 281531b74bb71e33ef0318e5d5b299fc7c38a73b

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fewer-test-runners-ci lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 9394aa3e0ad9e9f104f309bfb9b3e8c836e985c1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/utilities/run-py-tests-ci b/utilities/run-py-tests-ci
2index cbab346..67c9f96 100755
3--- a/utilities/run-py-tests-ci
4+++ b/utilities/run-py-tests-ci
5@@ -14,12 +14,12 @@ export MAAS_RAND_SEED PYTHONHASHSEED
6 echo "MAAS_RAND_SEED=${MAAS_RAND_SEED}"
7 echo "PYTHONHASHSEED=${PYTHONHASHSEED}"
8
9-bin/test.parallel --subprocess-per-core --emit-subunit | \
10+bin/test.parallel --emit-subunit | \
11 bin/subunit-1to2 | \
12 bin/subunit2junitxml --no-passthrough -f -o junit.xml | \
13 bin/subunit2pyunit --no-passthrough
14 res1=$?
15 DBUPGRADE_ARGS='-v 0' bin/database --preserve run -- make syncdb
16-bin/database run -- bin/pytest -n auto --junit-xml=junit-pytest.xml
17+bin/database run -- bin/pytest -n auto --maxprocesses=6 --dist=loadscope --junit-xml=junit-pytest.xml
18 res2=$?
19 exit $((res1 + res2))

Subscribers

People subscribed via source and target branches