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

Switch to containerless Zuul CI #26

Merged
merged 12 commits into from
Aug 5, 2024
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
2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[flake8]
max-line-length = 120
60 changes: 0 additions & 60 deletions .github/workflows/molecule.yml

This file was deleted.

26 changes: 17 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: '^(charts)'
exclude: '^(roles/kube_prometheus_stack/files/jsonnet|charts)'

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand All @@ -7,15 +7,23 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace

- repo: https://github.com/compilerla/conventional-pre-commit
rev: v2.0.0
- repo: https://github.com/psf/black
rev: 24.4.0
hooks:
- id: conventional-pre-commit
stages:
- commit-msg
- id: black

- repo: https://github.com/ansible/ansible-lint
rev: v6.13.1
- repo: https://github.com/pycqa/flake8
rev: 7.0.0
hooks:
- id: flake8

- repo: https://github.com/pycqa/isort
rev: 5.13.2
hooks:
- id: isort
args: ["--profile", "black", "--filter-files"]

- repo: https://github.com/ansible/ansible-lint.git
rev: v24.7.0
hooks:
- id: ansible-lint
files: \.(yaml|yml)$
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.10
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Ansible collection for containers

This is a collection which contains playbooks and roles which allow you to
deploy container runtimes using Ansible. This collection is used by the
deploy container runtimes using Ansible. This collection is used by the
[Atmosphere](https://github.com/vexxhost/atmosphere) project.

## Contributing
Expand Down
2 changes: 1 addition & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
requires_ansible: ">=2.13.4"
requires_ansible: ">=2.15.0"
19 changes: 19 additions & 0 deletions molecule/containerd/create.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright (c) 2024 VEXXHOST, Inc.
# SPDX-License-Identifier: Apache-2.0

- name: Wait for user to read warning
hosts: localhost
tasks:
- name: Wait for user to read warning
ignore_errors: true # noqa: ignore-errors
ansible.builtin.fail:
msg: >-
⚠️
This code will make substantial changes to your machine, it is strongly
recommended that you run this on a server or virtual machine that you
dedicate to this purpose.
⚠️

- name: Wait for user to read warning
ansible.builtin.wait_for:
timeout: 15
36 changes: 10 additions & 26 deletions molecule/containerd/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,23 @@
# Copyright (c) 2023 VEXXHOST, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# Copyright (c) 2024 VEXXHOST, Inc.
# SPDX-License-Identifier: Apache-2.0

dependency:
name: galaxy
driver:
name: docker
name: default
options:
managed: False
ansible_connection_options:
ansible_become: "true"
ansible_connection: local
platforms:
- name: instance
image: geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest
command: ${MOLECULE_DOCKER_COMMAND:-""}
privileged: true
cgroupns_mode: host
pre_build_image: true
environment:
container: docker
security_opts:
- apparmor=unconfined
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
- /lib/modules:/lib/modules:ro
provisioner:
name: ansible
config_options:
connection:
pipelining: true
defaults:
callbacks_enabled: ansible.posix.profile_tasks
verifier:
name: ansible
33 changes: 0 additions & 33 deletions molecule/containerd/prepare.yml

This file was deleted.

19 changes: 19 additions & 0 deletions molecule/docker/create.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright (c) 2024 VEXXHOST, Inc.
# SPDX-License-Identifier: Apache-2.0

- name: Wait for user to read warning
hosts: localhost
tasks:
- name: Wait for user to read warning
ignore_errors: true # noqa: ignore-errors
ansible.builtin.fail:
msg: >-
⚠️
This code will make substantial changes to your machine, it is strongly
recommended that you run this on a server or virtual machine that you
dedicate to this purpose.
⚠️

- name: Wait for user to read warning
ansible.builtin.wait_for:
timeout: 15
2 changes: 1 addition & 1 deletion molecule/docker/group_vars/all/molecule.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker_version: 24.0.7
docker_version: 24.0.9
39 changes: 13 additions & 26 deletions molecule/docker/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,26 @@
# Copyright (c) 2023 VEXXHOST, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# Copyright (c) 2024 VEXXHOST, Inc.
# SPDX-License-Identifier: Apache-2.0

dependency:
name: galaxy
driver:
name: docker
name: default
options:
managed: False
ansible_connection_options:
ansible_become: "true"
ansible_connection: local
platforms:
- name: instance
image: geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest
command: ${MOLECULE_DOCKER_COMMAND:-""}
privileged: true
cgroupns_mode: host
pre_build_image: true
environment:
container: docker
security_opts:
- apparmor=unconfined
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
- /lib/modules:/lib/modules:ro
provisioner:
name: ansible
config_options:
connection:
pipelining: true
defaults:
callbacks_enabled: ansible.posix.profile_tasks
inventory:
links:
group_vars: "${MOLECULE_SCENARIO_DIRECTORY}/group_vars"
verifier:
name: ansible
33 changes: 0 additions & 33 deletions molecule/docker/prepare.yml

This file was deleted.

19 changes: 19 additions & 0 deletions molecule/forget-package/create.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright (c) 2024 VEXXHOST, Inc.
# SPDX-License-Identifier: Apache-2.0

- name: Wait for user to read warning
hosts: localhost
tasks:
- name: Wait for user to read warning
ignore_errors: true # noqa: ignore-errors
ansible.builtin.fail:
msg: >-
⚠️
This code will make substantial changes to your machine, it is strongly
recommended that you run this on a server or virtual machine that you
dedicate to this purpose.
⚠️

- name: Wait for user to read warning
ansible.builtin.wait_for:
timeout: 15
Loading
Loading