diff --git a/.github/workflows/telegraf.yml b/.github/workflows/telegraf.yml index 1c47be2..8859023 100644 --- a/.github/workflows/telegraf.yml +++ b/.github/workflows/telegraf.yml @@ -27,46 +27,49 @@ jobs: fail-fast: false matrix: molecule_distro: - - container: rocky8 - image: geerlingguy/docker-rockylinux8-ansible + # - container: rocky8 + # image: geerlingguy/docker-rockylinux8-ansible - container: rocky9 image: geerlingguy/docker-rockylinux9-ansible - container: ubuntu2204 image: geerlingguy/docker-ubuntu2204-ansible:latest - container: ubuntu2004 image: geerlingguy/docker-ubuntu2004-ansible:latest - - container: ubuntu1804 - image: geerlingguy/docker-ubuntu1804-ansible:latest + # - container: ubuntu1804 + # image: geerlingguy/docker-ubuntu1804-ansible:latest - container: debian10 image: geerlingguy/docker-debian10-ansible:latest - container: debian11 image: geerlingguy/docker-debian11-ansible:latest steps: - name: Check out code - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: - python-version: 3.11.10 + python-version: 3.11.11 - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt + # - name: Install dependencies + # run: | + # python -m pip install --upgrade pip + # pip install -r requirements.txt + + - name: Install test dependencies. + run: pip3 install ansible molecule molecule-plugins[docker] docker pytest testinfra - name: Run role tests on empty systems in check-mode - run: >- - MY_MOLECULE_CONTAINER=${{ matrix.molecule_distro.container }} - MY_MOLECULE_IMAGE=${{ matrix.molecule_distro.image }} - MY_MOLECULE_GROUP=${{ matrix.molecule_distro.group }} - MY_MOLECULE_DOCKER_COMMAND=${{ matrix.molecule_distro.command }} - molecule test -s empty-checkmode + env: + MY_MOLECULE_CONTAINER: ${{ matrix.molecule_distro.container }} + MY_MOLECULE_IMAGE: ${{ matrix.molecule_distro.image }} + MY_MOLECULE_GROUP: ${{ matrix.molecule_distro.group }} + MY_MOLECULE_DOCKER_COMMAND: ${{ matrix.molecule_distro.command }} + run: molecule test -s empty-checkmode - name: Run role tests - run: >- - MY_MOLECULE_CONTAINER=${{ matrix.molecule_distro.container }} - MY_MOLECULE_IMAGE=${{ matrix.molecule_distro.image }} - MY_MOLECULE_GROUP=${{ matrix.molecule_distro.group }} - MY_MOLECULE_DOCKER_COMMAND=${{ matrix.molecule_distro.command }} - molecule test + env: + MY_MOLECULE_CONTAINER: ${{ matrix.molecule_distro.container }} + MY_MOLECULE_IMAGE: ${{ matrix.molecule_distro.image }} + MY_MOLECULE_GROUP: ${{ matrix.molecule_distro.group }} + MY_MOLECULE_DOCKER_COMMAND: ${{ matrix.molecule_distro.command }} + run: molecule test diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index f911bae..575e181 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -1,4 +1,4 @@ --- - hosts: telegraf roles: - - role: ansible-telegraf + - role: ../../ansible-telegraf diff --git a/molecule/empty-checkmode/converge.yml b/molecule/empty-checkmode/converge.yml index f911bae..2f6e326 100644 --- a/molecule/empty-checkmode/converge.yml +++ b/molecule/empty-checkmode/converge.yml @@ -1,4 +1,4 @@ --- - hosts: telegraf roles: - - role: ansible-telegraf + - role: ../../../ansible-telegraf diff --git a/requirements.txt b/requirements.txt index b029d34..44f4568 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -ansible==9.7.0 -ansible-compat==24.10.0 -ansible-core==2.18.1 +ansible==11.2.0 +ansible-compat==25.1.2 +ansible-core==2.18.2 docker==7.1.0 -molecule==6.0.3 +molecule==25.2.0 molecule-docker==2.1.0 -molecule-plugins==23.5.3 +molecule-plugins==23.7.0 netaddr==1.3.0 -pytest==8.3.3 +pytest==8.3.4 pytest-testinfra==10.1.1 testinfra==6.0.0