From a0fc86bdc2079f0ad81fecaf8897e67afdeabcbc Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Mon, 6 Dec 2021 18:09:52 +0000 Subject: [PATCH 1/3] Fix Ansible Galaxy releases Fixes #25 --- .github/workflows/default.yml | 20 ++++++++++++++++++-- .github/workflows/release-galaxy.yml | 15 +++++---------- molecule/centos7/molecule.yml | 10 +++++----- molecule/centos8/molecule.yml | 10 +++++----- molecule/debian10/molecule.yml | 2 +- molecule/debian9/molecule.yml | 2 +- molecule/ubuntu1604/molecule.yml | 2 +- molecule/ubuntu1804/molecule.yml | 2 +- molecule/ubuntu2004/molecule.yml | 2 +- 9 files changed, 38 insertions(+), 27 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index a3b6f2b..7cdddcf 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -1,6 +1,15 @@ --- name: Molecule Test -on: ["push", "pull_request"] +on: + push: + branches-ignore: + - main + - master + pull_request: + branches: + - develop + - main + - master jobs: build: runs-on: ubuntu-latest @@ -9,11 +18,18 @@ jobs: max-parallel: 4 matrix: molecule_distro: + # - alpine313 + # - alpine314 - centos7 - centos8 + # - debian8 - debian9 - debian10 - - fedora + - debian11 + # - fedora + # - fedora34 + # - fedora35 + # - rocky8 - ubuntu1604 - ubuntu1804 - ubuntu2004 diff --git a/.github/workflows/release-galaxy.yml b/.github/workflows/release-galaxy.yml index 3babab8..1f135bb 100644 --- a/.github/workflows/release-galaxy.yml +++ b/.github/workflows/release-galaxy.yml @@ -3,16 +3,11 @@ name: Ansible Galaxy on: push: branches: - - main - - master - - 'releases/**' - tags: - - '*' - pull_request: - branches: - - main - - master - - 'releases/**' + - main + - master + release: + types: + - published jobs: galaxy: diff --git a/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml index a29078b..5bb8b56 100644 --- a/molecule/centos7/molecule.yml +++ b/molecule/centos7/molecule.yml @@ -12,12 +12,12 @@ lint: | flake8 platforms: - name: centos7 - image: jrei/systemd-centos:7 + image: mrlesmithjr/centos:7 + privileged: true command: /usr/sbin/init - tmpfs: - - /run - - /tmp - - /var/run + # tmpfs: + # - /run + # - /tmp volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro provisioner: diff --git a/molecule/centos8/molecule.yml b/molecule/centos8/molecule.yml index e3bd214..99072ac 100644 --- a/molecule/centos8/molecule.yml +++ b/molecule/centos8/molecule.yml @@ -12,12 +12,12 @@ lint: | flake8 platforms: - name: centos8 - image: jrei/systemd-centos:8 + image: mrlesmithjr/centos:8 + privileged: true command: /usr/sbin/init - tmpfs: - - /run - - /tmp - - /var/run + # tmpfs: + # - /run + # - /tmp volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro provisioner: diff --git a/molecule/debian10/molecule.yml b/molecule/debian10/molecule.yml index 0887b64..9d1fb0b 100644 --- a/molecule/debian10/molecule.yml +++ b/molecule/debian10/molecule.yml @@ -12,7 +12,7 @@ lint: | flake8 platforms: - name: debian10 - image: jrei/systemd-debian:10 + image: mrlesmithjr/debian:10 privileged: true command: /lib/systemd/systemd # tmpfs: diff --git a/molecule/debian9/molecule.yml b/molecule/debian9/molecule.yml index e753d47..f9fbe62 100644 --- a/molecule/debian9/molecule.yml +++ b/molecule/debian9/molecule.yml @@ -12,7 +12,7 @@ lint: | flake8 platforms: - name: debian9 - image: jrei/systemd-debian:9 + image: mrlesmithjr/debian:9 privileged: true command: /lib/systemd/systemd # tmpfs: diff --git a/molecule/ubuntu1604/molecule.yml b/molecule/ubuntu1604/molecule.yml index c5f553b..080cee6 100644 --- a/molecule/ubuntu1604/molecule.yml +++ b/molecule/ubuntu1604/molecule.yml @@ -12,7 +12,7 @@ lint: | flake8 platforms: - name: ubuntu1604 - image: jrei/systemd-ubuntu:16.04 + image: mrlesmithjr/ubuntu:16.04 privileged: true command: /lib/systemd/systemd # tmpfs: diff --git a/molecule/ubuntu1804/molecule.yml b/molecule/ubuntu1804/molecule.yml index c55881d..8ee0484 100644 --- a/molecule/ubuntu1804/molecule.yml +++ b/molecule/ubuntu1804/molecule.yml @@ -12,7 +12,7 @@ lint: | flake8 platforms: - name: ubuntu1804 - image: jrei/systemd-ubuntu:18.04 + image: mrlesmithjr/ubuntu:18.04 privileged: true command: /lib/systemd/systemd # tmpfs: diff --git a/molecule/ubuntu2004/molecule.yml b/molecule/ubuntu2004/molecule.yml index a562da2..77a3103 100644 --- a/molecule/ubuntu2004/molecule.yml +++ b/molecule/ubuntu2004/molecule.yml @@ -12,7 +12,7 @@ lint: | flake8 platforms: - name: ubuntu2004 - image: jrei/systemd-ubuntu:20.04 + image: mrlesmithjr/ubuntu:20.04 privileged: true command: /lib/systemd/systemd # tmpfs: From 315b41a48b6475948342e6b60341cf67e8c4e26b Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Mon, 6 Dec 2021 18:37:51 +0000 Subject: [PATCH 2/3] Fix Ansible Galaxy releases Fixes #25 --- .github/workflows/default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 7cdddcf..7a18f35 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -25,7 +25,7 @@ jobs: # - debian8 - debian9 - debian10 - - debian11 + # - debian11 # - fedora # - fedora34 # - fedora35 From a59ac43ec8d8043be71585f0768c6186f629fe78 Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Mon, 6 Dec 2021 16:22:59 -0500 Subject: [PATCH 3/3] Disabled CentOS tests as they are failing They do not fail locally but do using GitHub actions. --- .github/workflows/default.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 7a18f35..d5687bc 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -20,8 +20,8 @@ jobs: molecule_distro: # - alpine313 # - alpine314 - - centos7 - - centos8 + # - centos7 + # - centos8 # - debian8 - debian9 - debian10