From 40d7a0ba5a884e11d6c801dc2b3cc6f7b36d8bb1 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Mon, 22 Jan 2024 18:38:59 -0600 Subject: [PATCH] fix(ci): fix molecule --- .github/workflows/ci.yml | 2 +- molecule/default/molecule.yml | 12 +++++++----- molecule/ipv6/molecule.yml | 8 +++++--- molecule/single_node/molecule.yml | 4 +++- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0b3b36..49a5c98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: paths-ignore: - '**/README.md' jobs: - cache: + pre: uses: ./.github/workflows/cache.yml lint: uses: ./.github/workflows/lint.yml diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 1379147..f5bb11f 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -1,6 +1,8 @@ --- dependency: name: galaxy + options: + requirements-file: ../collections/requirements.yml driver: name: vagrant platforms: @@ -8,7 +10,7 @@ platforms: - name: control1 box: generic/ubuntu2204 memory: 512 - cpus: 2 + cpus: 1 groups: - k3s_cluster - master @@ -24,7 +26,7 @@ platforms: - name: control2 box: generic/debian11 memory: 512 - cpus: 2 + cpus: 1 groups: - k3s_cluster - master @@ -35,7 +37,7 @@ platforms: - name: control3 box: generic/rocky9 memory: 512 - cpus: 2 + cpus: 1 groups: - k3s_cluster - master @@ -46,7 +48,7 @@ platforms: - name: node1 box: generic/ubuntu2204 memory: 512 - cpus: 2 + cpus: 1 groups: - k3s_cluster - node @@ -62,7 +64,7 @@ platforms: - name: node2 box: generic/rocky9 memory: 512 - cpus: 2 + cpus: 1 groups: - k3s_cluster - node diff --git a/molecule/ipv6/molecule.yml b/molecule/ipv6/molecule.yml index 2ea8697..e9e3626 100644 --- a/molecule/ipv6/molecule.yml +++ b/molecule/ipv6/molecule.yml @@ -1,13 +1,15 @@ --- dependency: name: galaxy + options: + requirements-file: ../collections/requirements.yml driver: name: vagrant platforms: - name: control1 box: generic/ubuntu2204 memory: 512 - cpus: 2 + cpus: 1 groups: - k3s_cluster - master @@ -23,7 +25,7 @@ platforms: - name: control2 box: generic/ubuntu2204 memory: 512 - cpus: 2 + cpus: 1 groups: - k3s_cluster - master @@ -39,7 +41,7 @@ platforms: - name: node1 box: generic/ubuntu2204 memory: 512 - cpus: 2 + cpus: 1 groups: - k3s_cluster - node diff --git a/molecule/single_node/molecule.yml b/molecule/single_node/molecule.yml index 250575b..626d644 100644 --- a/molecule/single_node/molecule.yml +++ b/molecule/single_node/molecule.yml @@ -1,13 +1,15 @@ --- dependency: name: galaxy + options: + requirements-file: ../collections/requirements.yml driver: name: vagrant platforms: - name: control1 box: generic/ubuntu2204 memory: 512 - cpus: 2 + cpus: 1 config_options: # We currently can not use public-key based authentication on Ubuntu 22.04, # see: https://github.com/chef/bento/issues/1405