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.

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

Update devcontainer and molecule configurations #83

Merged
merged 2 commits into from
Dec 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
{
"name": "Python 3",
"image": "mcr.microsoft.com/devcontainers/python:0-3.9",
"image": "mcr.microsoft.com/devcontainers/python:3.10",
"features": {
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/devcontainers-contrib/features/ansible:2": {},
"ghcr.io/devcontainers-contrib/features/flake8:2": {},
"ghcr.io/devcontainers-contrib/features/yamllint:2": {}
},
"customizations": {
"vscode": {
"extensions": [
"redhat.ansible"
]
}
}
}
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
push:
branches:
- master
schedule:
- cron: '30 5 24 * *'

jobs:
ansible-role-ci:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
## Python
.pytest_cache/
__pycache__/
*.py[cod]
*.py[codz]
*$py.class
pytestdebug.log
45 changes: 33 additions & 12 deletions molecule/debian/molecule.yml → molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,59 @@ lint: |
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
platforms:
- name: debian-10
image: "ghcr.io/hspaans/molecule-container-debian:10"
image: "ghcr.io/hspaans/molecule-containers:debian-10"
command: ""
cgroupns_mode: host
tmpfs:
- /run
- /tmp
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
pre_build_image: true

- name: debian-11
image: "ghcr.io/hspaans/molecule-container-debian:11"
image: "ghcr.io/hspaans/molecule-containers:debian-11"
command: ""
cgroupns_mode: host
tmpfs:
- /run
- /tmp
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
pre_build_image: true

- name: debian-12
image: "ghcr.io/hspaans/molecule-container-debian:12"
image: "ghcr.io/hspaans/molecule-containers:debian-12"
command: ""
cgroupns_mode: host
tmpfs:
- /run
- /tmp
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
pre_build_image: true

- name: ubuntu-20.04
image: "ghcr.io/hspaans/molecule-containers:ubuntu-20.04"
command: ""
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
pre_build_image: true

- name: ubuntu-22.04
image: "ghcr.io/hspaans/molecule-containers:ubuntu-22.04"
command: ""
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
pre_build_image: true

- name: ubuntu-24.04
image: "ghcr.io/hspaans/molecule-containers:ubuntu-24.04"
command: ""
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
pre_build_image: true

provisioner:
name: ansible
config_options:
Expand Down
42 changes: 0 additions & 42 deletions molecule/ubuntu/molecule.yml

This file was deleted.