From f3640e5c9f4540065b74306abd13e2aaa7dee59d Mon Sep 17 00:00:00 2001 From: Xan Manning Date: Mon, 2 May 2022 18:09:04 +0100 Subject: [PATCH] WIP(molecule): default image no longer prebuilt to support alpine --- .github/workflows/ci.yml | 26 ++++++++++++++-------- molecule/autodeploy/molecule.yml | 12 +++++----- molecule/debug/molecule.yml | 12 +++++----- molecule/default/molecule.yml | 12 +++++----- molecule/highavailabilitydb/molecule.yml | 12 +++++----- molecule/highavailabilityetcd/molecule.yml | 12 +++++----- molecule/nodeploy/molecule.yml | 12 +++++----- 7 files changed, 53 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49b3f56..4163429 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,24 +22,31 @@ jobs: strategy: matrix: include: - - distro: debian10 + - distro: geerlingguy/docker-debian11-ansible:latest scenario: default - - distro: ubuntu2004 + prebuilt: 'true' + - distro: geerlingguy/docker-ubuntu2204-ansible:latest scenario: default - - distro: amazonlinux2 + prebuilt: 'true' + - distro: geerlingguy/docker-amazonlinux2-ansible:latest scenario: default - - distro: ubuntu1804 + prebuilt: 'true' + - distro: geerlingguy/docker-ubuntu2004-ansible:latest scenario: default - - distro: fedora33 + prebuilt: 'true' + - distro: geerlingguy/docker-fedora35-ansible:latest scenario: nodeploy - - distro: fedora32 + prebuilt: 'true' + - distro: geerlingguy/docker-fedora34-ansible:latest scenario: highavailabilitydb - - distro: fedora31 + prebuilt: 'true' + - distro: geerlingguy/docker-fedora33-ansible:latest scenario: autodeploy - - distro: debian11 + - distro: alpine:3.15 scenario: highavailabilityetcd - - distro: rockylinux8 + - distro: geerlingguy/docker-rockylinux8-ansible:latest scenario: highavailabilityetcd + prebuilt: 'true' steps: - name: Checkout codebase @@ -62,3 +69,4 @@ jobs: PY_COLORS: '1' ANSIBLE_FORCE_COLOR: '1' MOLECULE_DISTRO: ${{ matrix.distro }} + MOLECULE_PREBUILT: ${{ matrix.prebuilt }} diff --git a/molecule/autodeploy/molecule.yml b/molecule/autodeploy/molecule.yml index 3e01012..968df05 100644 --- a/molecule/autodeploy/molecule.yml +++ b/molecule/autodeploy/molecule.yml @@ -26,30 +26,30 @@ lint: | ansible-lint --exclude molecule/ platforms: - name: node1 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node2 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node3 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet provisioner: diff --git a/molecule/debug/molecule.yml b/molecule/debug/molecule.yml index 3e01012..968df05 100644 --- a/molecule/debug/molecule.yml +++ b/molecule/debug/molecule.yml @@ -26,30 +26,30 @@ lint: | ansible-lint --exclude molecule/ platforms: - name: node1 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node2 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node3 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet provisioner: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 3e01012..968df05 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -26,30 +26,30 @@ lint: | ansible-lint --exclude molecule/ platforms: - name: node1 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node2 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node3 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet provisioner: diff --git a/molecule/highavailabilitydb/molecule.yml b/molecule/highavailabilitydb/molecule.yml index 2298866..1365df4 100644 --- a/molecule/highavailabilitydb/molecule.yml +++ b/molecule/highavailabilitydb/molecule.yml @@ -26,30 +26,30 @@ lint: | ansible-lint --exclude molecule/ platforms: - name: node1 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node2 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node3 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: database diff --git a/molecule/highavailabilityetcd/molecule.yml b/molecule/highavailabilityetcd/molecule.yml index 4fc7ab3..57120e0 100644 --- a/molecule/highavailabilityetcd/molecule.yml +++ b/molecule/highavailabilityetcd/molecule.yml @@ -26,30 +26,30 @@ lint: | ansible-lint --exclude molecule/ platforms: - name: node1 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node2 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node3 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: loadbalancer diff --git a/molecule/nodeploy/molecule.yml b/molecule/nodeploy/molecule.yml index 3e01012..968df05 100644 --- a/molecule/nodeploy/molecule.yml +++ b/molecule/nodeploy/molecule.yml @@ -26,30 +26,30 @@ lint: | ansible-lint --exclude molecule/ platforms: - name: node1 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node2 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet - name: node3 - image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest" + image: "${MOLECULE_DISTRO:-ubuntu:focal}" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true - pre_build_image: ${MOLECULE_PREBUILT:-true} + pre_build_image: ${MOLECULE_PREBUILT:-false} networks: - name: k3snet provisioner: