From 63be1e7aa0656ec8852915b2d380e68a34c99b64 Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Mon, 23 Dec 2019 20:08:21 +0100 Subject: [PATCH] Different way of working with parallel. --- templates/ansible.yml.j2 | 6 +++++- templates/travis.yml.j2 | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/templates/ansible.yml.j2 b/templates/ansible.yml.j2 index 9513a54..f907570 100644 --- a/templates/ansible.yml.j2 +++ b/templates/ansible.yml.j2 @@ -100,7 +100,11 @@ jobs: with: image: {% raw %}${{ matrix.image }}{% endraw %} - options: parallel +{% if tox_parallel is defined %} +{% if tox_parallel %} + options: "--parallel all" +{% endif %} +{% endif %} release: needs: - test diff --git a/templates/travis.yml.j2 b/templates/travis.yml.j2 index ac9a30b..5b07a4d 100644 --- a/templates/travis.yml.j2 +++ b/templates/travis.yml.j2 @@ -97,12 +97,12 @@ install: - pip install tox script: -{% if travis_parallel is defined %} -{% if not travis_parallel %} - - tox +{% if tox_parallel is defined %} +{% if tox_parallel %} + - tox --parallel all {% endif %} {% else %} - - tox --parallel all + - tox {% endif %} notifications: