Skip to content

Commit

Permalink
Ansible 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
buluma committed Sep 11, 2022
1 parent a9c4ba1 commit ae56780
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 54 deletions.
23 changes: 14 additions & 9 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,18 @@
name: Ansible Molecule

on:
# Schedule updates (once daily)
# Schedule updates (once weekly)
schedule:
- cron: '1 1 * * *'
- cron: '1 1/14 * * 0,6'
workflow_dispatch:
push: {branches: ["master", "main"]}
push:
branches:
- master
- main
- testing
paths-ignore:
- '**/README.md'
- '**/CHANGELOG.md'

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
Expand All @@ -37,25 +44,23 @@ jobs:
matrix:
config:
- image: "enterpriselinux"
tag: "latest"
tag: "8"
- image: "debian-systemd"
tag: "latest"
- image: "debian-systemd"
tag: "bookworm"
- image: "fedora-systemd"
tag: "34"
- image: "fedora-systemd"
tag: "35"
- image: "fedora-systemd"
tag: "34"
- image: "fedora-systemd"
tag: "latest"
- image: "docker-ubuntu-systemd"
tag: "latest"
- image: "docker-ubuntu-systemd"
tag: "bionic"
- image: "docker-ubuntu-systemd"
tag: "focal"
- image: "docker-ubuntu-systemd"
tag: "jammy"
tag: "bionic"
steps:
- name: checkout
uses: actions/checkout@v3
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release_drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ on:
- master
- main
- testing
paths-ignore:
- '**/README.md'
- '**/CHANGELOG.md'
# pull_request event is required only for autolabeler
pull_request:
# Only following types are handled by the action, but one can default to all as well
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
.tox
.cache
.DS_Store
./molecule_tests.sh
22 changes: 9 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
image: "buluma/github-action-molecule:4.0.9"
image: "buluma/github-action-molecule:5.0.0"

services:
- docker:dind
Expand All @@ -20,25 +20,23 @@ molecule:
parallel:
matrix:
- image: "enterpriselinux"
tag: "latest"
tag: "8"
- image: "debian-systemd"
tag: "latest"
- image: "debian-systemd"
tag: "bookworm"
- image: "fedora-systemd"
tag: "34"
- image: "fedora-systemd"
tag: "35"
- image: "fedora-systemd"
tag: "34"
- image: "fedora-systemd"
tag: "latest"
- image: "docker-ubuntu-systemd"
tag: "latest"
- image: "docker-ubuntu-systemd"
tag: "bionic"
- image: "docker-ubuntu-systemd"
tag: "focal"
- image: "docker-ubuntu-systemd"
tag: "jammy"
tag: "bionic"

testing:
stage: test
Expand All @@ -52,22 +50,20 @@ testing:
parallel:
matrix:
- image: "enterpriselinux"
tag: "latest"
tag: "8"
- image: "debian-systemd"
tag: "latest"
- image: "debian-systemd"
tag: "bookworm"
- image: "fedora-systemd"
tag: "34"
- image: "fedora-systemd"
tag: "35"
- image: "fedora-systemd"
tag: "34"
- image: "fedora-systemd"
tag: "latest"
- image: "docker-ubuntu-systemd"
tag: "latest"
- image: "docker-ubuntu-systemd"
tag: "bionic"
- image: "docker-ubuntu-systemd"
tag: "focal"
- image: "docker-ubuntu-systemd"
tag: "jammy"
tag: "bionic"
29 changes: 0 additions & 29 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

Apache License
Version 2.0, 07 2022
Version 2.0, 09 2022
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
Expand Down
3 changes: 3 additions & 0 deletions meta/preferences.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
---
#
# Ansible managed
#
tox_parallel: yes
40 changes: 40 additions & 0 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,47 @@ platforms:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
privileged: yes
pre_build_image: yes
tty: true
environment:
container: docker
provisioner:
name: ansible
config_options:
defaults:
interpreter_python: auto_legacy_silent
ssh_connection:
pipelining: true
verifier:
name: ansible
scenario:
create_sequence:
- create
- prepare
check_sequence:
- cleanup
- destroy
- create
- prepare
- converge
- check
- destroy
converge_sequence:
- create
- prepare
- converge
destroy_sequence:
- cleanup
- destroy
test_sequence:
- lint
- cleanup
- destroy
- syntax
- create
- prepare
- converge
- idempotence
- side_effect
- verify
- cleanup
- destroy
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# tasks file for ansible_lint

- name: install ansible_lint
- name: Install ansible_lint
ansible.builtin.pip:
name: "{{ ansible_lint_packages }}"
state: present
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
[tox]
minversion = 3.21.4
envlist = py{310}-ansible-{4,5}
envlist = py{310}-ansible-{4,5,6}

skipsdist = true

Expand Down

0 comments on commit ae56780

Please sign in to comment.