From 248c9726a3a8daf5fb0815840a534244b189de73 Mon Sep 17 00:00:00 2001 From: Bertrand Lanson Date: Sat, 9 Dec 2023 11:32:43 +0100 Subject: [PATCH] feat(tests): add requirement files to tests and prepare stages --- molecule/default/prepare.yml | 17 +++++++++++++++++ molecule/default/requirements.yml | 6 ++++++ molecule/default_vagrant/group_vars/all.yml | 9 +-------- molecule/with_docker_host/requirements.yml | 6 ++++++ 4 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 molecule/default/prepare.yml create mode 100644 molecule/default/requirements.yml create mode 100644 molecule/with_docker_host/requirements.yml diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml new file mode 100644 index 0000000..60391d6 --- /dev/null +++ b/molecule/default/prepare.yml @@ -0,0 +1,17 @@ +--- +- name: Prepare + hosts: all + tasks: + - name: "Include ednxzu.install_docker" + ansible.builtin.include_role: + name: ednxzu.install_docker + vars: + install_docker_edition: ce + install_docker_start_service: true + install_docker_compose: false + install_docker_compose_version: latest + install_docker_python_packages: true + install_docker_python_packages_version: latest + install_docker_users: [] + install_docker_daemon_options: + live-restore: true diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml new file mode 100644 index 0000000..e53b0f7 --- /dev/null +++ b/molecule/default/requirements.yml @@ -0,0 +1,6 @@ +--- +# requirements file for molecule +roles: + - name: ednxzu.manage_repositories + - name: ednxzu.manage_apt_packages + - name: mhutter.docker-systemd-service diff --git a/molecule/default_vagrant/group_vars/all.yml b/molecule/default_vagrant/group_vars/all.yml index 8339b8d..6470cdf 100644 --- a/molecule/default_vagrant/group_vars/all.yml +++ b/molecule/default_vagrant/group_vars/all.yml @@ -19,14 +19,7 @@ deploy_gitea_runner_config: insecure: false fetch_timeout: 5s fetch_interval: 15s - labels: - - alpine-latest:docker://node:16-alpine - - alpine-3.18:docker://node:16-alpine3.18 - - alpine-3.17:docker://node:16-alpine3.17 - - alpine-3.16:docker://node:16-alpine3.16 - - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest - - ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04 - - ubuntu-20.04:docker://ghcr.io/catthehacker/ubuntu:act-20.04 + labels: [] cache: enabled: true dir: "/cache" # this HAS TO BE /cache if deploy_gitea_runner_deploy_method is docker diff --git a/molecule/with_docker_host/requirements.yml b/molecule/with_docker_host/requirements.yml new file mode 100644 index 0000000..e53b0f7 --- /dev/null +++ b/molecule/with_docker_host/requirements.yml @@ -0,0 +1,6 @@ +--- +# requirements file for molecule +roles: + - name: ednxzu.manage_repositories + - name: ednxzu.manage_apt_packages + - name: mhutter.docker-systemd-service