Catching up.

This commit is contained in:
Robert de Bock 2020-10-27 16:38:37 +01:00
parent c9db03493b
commit edc40e9f3a
4 changed files with 2 additions and 13 deletions

View File

@ -15,6 +15,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: galaxy - name: galaxy
uses: robertdebock/galaxy-action@1.0.1 uses: robertdebock/galaxy-action@1.1.0
with: with:
galaxy_api_key: {% raw %}${{ secrets.galaxy_api_key }}{% endraw %} galaxy_api_key: {% raw %}${{ secrets.galaxy_api_key }}{% endraw %}

View File

@ -56,11 +56,3 @@ jobs:
image: {% raw %}${{ matrix.config.image }}{% endraw %} image: {% raw %}${{ matrix.config.image }}{% endraw %}
tag: {% raw %}${{ matrix.config.tag }}{% endraw %} tag: {% raw %}${{ matrix.config.tag }}{% endraw %}
{% if tox_parallel is defined %}
{% if tox_parallel %}
options: "--parallel all"
env:
TOX_PARALLEL_NO_SPINNER: 1
{% endif %}
{% endif %}

View File

@ -16,6 +16,7 @@ deps =
next: git+https://github.com/ansible/ansible.git@devel next: git+https://github.com/ansible/ansible.git@devel
molecule[docker]>=3, <4 molecule[docker]>=3, <4
docker>=4.2, <4.3 docker>=4.2, <4.3
ansible-lint
commands = molecule test commands = molecule test
setenv = setenv =
TOX_ENVNAME={envname} TOX_ENVNAME={envname}

View File

@ -31,11 +31,7 @@ install:
- pip install tox - pip install tox
script: script:
{% if tox_parallel is defined and tox_parallel %}
- function retry { counter=0 ; until "$@" ; do exit=$? ; counter=$(($counter + 1)) ; if [ $counter -ge 3 ] ; then return $exit ; fi ; done ; return 0; } ; retry tox --parallel all
{% else %}
- function retry { counter=0 ; until "$@" ; do exit=$? ; counter=$(($counter + 1)) ; if [ $counter -ge 3 ] ; then return $exit ; fi ; done ; return 0; } ; retry tox - function retry { counter=0 ; until "$@" ; do exit=$? ; counter=$(($counter + 1)) ; if [ $counter -ge 3 ] ; then return $exit ; fi ; done ; return 0; } ; retry tox
{% endif %}
notifications: notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/ webhooks: https://galaxy.ansible.com/api/v1/notifications/