Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ubuntu 22.04 molecule test to actually run on 22.04 #594

Merged
merged 3 commits into from
Apr 2, 2024
Merged

Fix ubuntu 22.04 molecule test to actually run on 22.04 #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba08688
Fix ubuntu 22.04 molecule test to actually run on 22.04
slonopotamus Apr 2, 2024
05ba6a2
Install python3 package instead of just python on Ubuntu
slonopotamus Apr 2, 2024
0cdcc6e
Adjust python-apt package name for Ubuntu 22.04
slonopotamus Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion molecule/_shared/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN if [ $(command -v apt-get) ]; then \
if grep -q "Debian GNU/Linux 11" /etc/os-release; then \
apt-get update && apt-get install -y python sudo bash ca-certificates iproute2 python-apt-common && apt-get clean; \
else \
apt-get update && apt-get install -y python sudo bash ca-certificates iproute2 python-apt && apt-get clean; \
apt-get update && apt-get install -y python3 sudo bash ca-certificates iproute2 python3-apt && apt-get clean; \
fi \
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; \
Expand Down
2 changes: 1 addition & 1 deletion molecule/ubuntu-22.04/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ platforms:
- name: ubuntu-22.04
groups:
- consul_instances
image: dokken/ubuntu-20.04
image: dokken/ubuntu-22.04
command: /lib/systemd/systemd
dockerfile: ../_shared/Dockerfile.j2
capabilities:
Expand Down