Merge pull request #16 from cisagov/lineage/skeleton

Lineage pull request for: skeleton

Author: jsf9k

.config/molecule/config.yml

@@ -112,42 +112,6 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
-  - cgroupns_mode: host
-    command: /lib/systemd/systemd
-    image: docker.io/geerlingguy/docker-fedora39-ansible:latest
-    name: fedora39-systemd-amd64
-    platform: amd64
-    pre_build_image: true
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-  - cgroupns_mode: host
-    command: /lib/systemd/systemd
-    image: docker.io/geerlingguy/docker-fedora39-ansible:latest
-    name: fedora39-systemd-arm64
-    platform: arm64
-    pre_build_image: true
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-  - cgroupns_mode: host
-    command: /lib/systemd/systemd
-    image: docker.io/geerlingguy/docker-fedora40-ansible:latest
-    name: fedora40-systemd-amd64
-    platform: amd64
-    pre_build_image: true
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-  - cgroupns_mode: host
-    command: /lib/systemd/systemd
-    image: docker.io/geerlingguy/docker-fedora40-ansible:latest
-    name: fedora40-systemd-arm64
-    platform: arm64
-    pre_build_image: true
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
   - cgroupns_mode: host
     command: /lib/systemd/systemd
     image: docker.io/geerlingguy/docker-fedora41-ansible:latest
@@ -168,17 +132,17 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
   - cgroupns_mode: host
     command: /lib/systemd/systemd
-    image: docker.io/geerlingguy/docker-ubuntu2004-ansible:latest
-    name: ubuntu-20-systemd-amd64
+    image: docker.io/geerlingguy/docker-fedora42-ansible:latest
+    name: fedora42-systemd-amd64
     platform: amd64
     pre_build_image: true
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
   - cgroupns_mode: host
     command: /lib/systemd/systemd
-    image: docker.io/geerlingguy/docker-ubuntu2004-ansible:latest
-    name: ubuntu-20-systemd-arm64
+    image: docker.io/geerlingguy/docker-fedora42-ansible:latest
+    name: fedora42-systemd-arm64
     platform: arm64
     pre_build_image: true
     privileged: true

.github/workflows/build.yml

@@ -221,11 +221,9 @@ jobs:
           - debian11-systemd
           - debian12-systemd
           - debian13-systemd
-          - fedora39-systemd
-          - fedora40-systemd
           - fedora41-systemd
+          - fedora42-systemd
           - kali-systemd
-          - ubuntu-20-systemd
           - ubuntu-22-systemd
           - ubuntu-24-systemd
         scenario:

.pre-commit-config.yaml

@@ -173,7 +173,7 @@ repos:
 
   # Ansible hooks
   - repo: https://github.com/ansible/ansible-lint
-    rev: v25.1.3
+    rev: v25.4.0
     hooks:
       - id: ansible-lint
         additional_dependencies:

meta/main.yml

@@ -31,15 +31,13 @@ galaxy_info:
         - trixie
     - name: Fedora
       versions:
-        - "39"
-        - "40"
         - "41"
+        - "42"
     - name: Kali
       versions:
         - "2023"
     - name: Ubuntu
       versions:
-        - focal
         - jammy
         - noble
   role_name: skeleton

molecule/default/requirements.yml

@@ -8,5 +8,7 @@ collections:
     version: ">=3.10.2"
 
 roles:
+  - name: debian_archive
+    src: https://github.com/cisagov/ansible-role-debian-archive
   - name: upgrade
     src: https://github.com/cisagov/ansible-role-upgrade

molecule/default/upgrade.yml

@@ -4,6 +4,12 @@
   become: true
   become_method: ansible.builtin.sudo
   tasks:
+    - name: >
+        Switch Debian platforms that are no longer supported to Debian
+        Archive package repositories
+      ansible.builtin.include_role:
+        name: debian_archive
+
     - name: Upgrade system packages
       ansible.builtin.include_role:
         name: upgrade

version.txt

@@ -1 +1 @@
-1.0.0
+2.1.0