Skip to content

Commit

Permalink
Fix for Debian 11 (#76)
Browse files Browse the repository at this point in the history
* Fix for Debian 11 install
* Pin CentOS version
* Bump Python version
  • Loading branch information
m3nu authored Aug 18, 2021
1 parent 81a3f11 commit 10ed2c3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: 3.8
- name: Install Molecule
run: |
pip install -U pip setuptools wheel
pip install -r requirements-dev.txt
# - name: Debugging with tmate
# uses: mxschmitt/[email protected]
- name: Test using Molecule
run: molecule test
run: molecule test
4 changes: 2 additions & 2 deletions molecule/default/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ ENV {{ var }} {{ value }}
{% endfor %}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates iproute2 python-apt aptitude && apt-get clean; \
RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates iproute2 python3-apt aptitude && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 sudo bash iproute && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y /usr/bin/python /usr/bin/python2-config sudo yum-plugin-ovl bash iproute && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml iproute2 && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates iproute2 && xbps-remove -O; fi
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates iproute2 && xbps-remove -O; fi
12 changes: 7 additions & 5 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ driver:
platforms:
- name: centos-7
image: centos:7
- name: centos-latest
image: centos:latest
- name: centos-8
image: centos:8
- name: fedora-latest
image: fedora:latest
- name: debian-stable
image: debian:stable
- name: debian-bullseye
image: debian:bullseye
- name: debian-buster
image: debian:buster
- name: ubuntu-bionic
image: ubuntu:bionic
- name: ubuntu-latest
Expand All @@ -23,4 +25,4 @@ verifier:
lint: |
set -e
yamllint .
ansible-lint .
ansible-lint .

0 comments on commit 10ed2c3

Please sign in to comment.