Merge 01d4bb8f8a into edf0c9eebd

.github/workflows/cache.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   molecule:
     name: cache
-    runs-on: ubuntu-latest
+    runs-on: macos-13
     env:
       PYTHON_VERSION: "3.11"
 
@@ -58,41 +58,30 @@ jobs:
           restore-keys: |
             vagrant-boxes
 
-      - name: install apt packages
+      - name: Configure Homebrew cache
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        id: cache-homebrew
+        with:
+          path: |
+            ~/Library/Caches/Homebrew
+          key: brew-${{ hashFiles('./Brewfile') }}
+          restore-keys: brew-
+
+      - name: Update Homebrew
+        if: | # only run if false since this is just a cache step
+          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-vagrant.outputs.cache-hit != 'true'
         run: |
-          wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
+          brew update --preinstall
-          echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
-          sudo apt update && sudo apt -y install vagrant virtualbox
 
-
+      - name: Install Homebrew dependencies
-      # - name: Configure Homebrew cache
+        if: | # only run if false since this is just a cache step
-      #   uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-cache-vagrant.outputs.cache-hit != 'true'
-      #   id: cache-homebrew
+        run: |
-      #   with:
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
-      #     path: |
-      #       ~/Library/Caches/Homebrew
-      #     key: brew-${{ hashFiles('./Brewfile') }}
-      #     restore-keys: brew-
-
-      # - name: Update Homebrew
-      #   if: | # only run if false since this is just a cache step
-      #     steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-vagrant.outputs.cache-hit != 'true'
-      #   run: |
-      #     brew update --preinstall
-
-      # - name: Install Homebrew dependencies
-      #   if: | # only run if false since this is just a cache step
-      #     steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-cache-vagrant.outputs.cache-hit != 'true'
-      #   run: |
-      #     env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
-      #     vagrant --version
-      #     vboxmanage --version
 
       - name: Download Vagrant boxes for all scenarios
         # To save some cache space, all scenarios share the same cache key.
         # On the other hand, this means that the cache contents should be
         # the same across all scenarios. This step ensures that.
         if: steps.cache-vagrant.outputs.cache-hit != 'true' # only run if false since this is just a cache step
-        run: |
+        run: ./.github/download-boxes.sh
-          ./.github/download-boxes.sh
-          vagrant box list

.github/workflows/ci.yml

@@ -8,11 +8,11 @@ on:
     paths-ignore:
       - '**/README.md'
 jobs:
-  pre:
+  cache:
     uses: ./.github/workflows/cache.yml
   lint:
     uses: ./.github/workflows/lint.yml
-    needs: [pre]
+    needs: [cache]
   test:
     uses: ./.github/workflows/test.yml
-    needs: [pre, lint]
+    needs: [cache, lint]

.github/workflows/lint.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   pre-commit-ci:
     name: Pre-Commit
-    runs-on: ubuntu-latest
+    runs-on: macos-13
     env:
       PYTHON_VERSION: "3.11"
 
@@ -42,7 +42,7 @@ jobs:
 
   ensure-pinned-actions:
     name: Ensure SHA Pinned Actions
-    runs-on: ubuntu-latest
+    runs-on: macos-13
     steps:
       - name: Checkout code
         uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0

.github/workflows/test.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   molecule:
     name: Molecule
-    runs-on: ubuntu-latest
+    runs-on: macos-13
     strategy:
       matrix:
         scenario:
@@ -41,28 +41,20 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip' # caching pip dependencies
 
-      # - name: Restore Homebrew cache
+      - name: Restore Homebrew cache
-      #   uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-      #   with:
+        with:
-      #     path: |
+          path: |
-      #       ~/Library/Caches/Homebrew
+            ~/Library/Caches/Homebrew
-      #     key: brew-${{ hashFiles('./Brewfile') }}
+          key: brew-${{ hashFiles('./Brewfile') }}
 
-      # - name: Update Homebrew
+      - name: Update Homebrew
-      #   run: |
-      #     brew update --preinstall
-
-      # - name: Install Homebrew dependencies
-      #   run: |
-      #     env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
-      #     vagrant --version
-      #     vboxmanage --version
-
-      - name: install apt packages
         run: |
-          wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
+          brew update --preinstall
-          echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+
-          sudo apt update && sudo apt -y install vagrant virtualbox
+      - name: Install Homebrew dependencies
+        run: |
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
 
       - name: Restore vagrant Boxes cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0

Brewfile

@@ -1,5 +1,5 @@
 tap "homebrew/bundle"
-tap "hashicorp/tap"
+tap "homebrew/cask-versions"
 
 cask "virtualbox"
 cask "vagrant"

molecule/default/molecule.yml

@@ -1,8 +1,6 @@
 ---
 dependency:
   name: galaxy
-  options:
-    requirements-file: collections/requirements.yml
 driver:
   name: vagrant
 platforms:
@@ -10,7 +8,7 @@ platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 512
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -26,7 +24,7 @@ platforms:
   - name: control2
     box: generic/debian11
     memory: 512
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -37,7 +35,7 @@ platforms:
   - name: control3
     box: generic/rocky9
     memory: 512
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -48,7 +46,7 @@ platforms:
   - name: node1
     box: generic/ubuntu2204
     memory: 512
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - node
@@ -64,7 +62,7 @@ platforms:
   - name: node2
     box: generic/rocky9
     memory: 512
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - node

molecule/ipv6/molecule.yml

@@ -1,15 +1,13 @@
 ---
 dependency:
   name: galaxy
-  options:
-    requirements-file: collections/requirements.yml
 driver:
   name: vagrant
 platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 512
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -25,7 +23,7 @@ platforms:
   - name: control2
     box: generic/ubuntu2204
     memory: 512
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -41,7 +39,7 @@ platforms:
   - name: node1
     box: generic/ubuntu2204
     memory: 512
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - node

molecule/single_node/molecule.yml

@@ -1,15 +1,13 @@
 ---
 dependency:
   name: galaxy
-  options:
-    requirements-file: collections/requirements.yml
 driver:
   name: vagrant
 platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 512
-    cpus: 1
+    cpus: 2
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,
       # see: https://github.com/chef/bento/issues/1405

requirements.in

@@ -2,7 +2,7 @@ ansible-core>=2.16.2
 jmespath>=1.0.1
 jsonpatch>=1.33
 kubernetes>=29.0.0
-molecule-plugins[vagrant]
+molecule-vagrant>=2.0.0
 molecule>=6.0.3
 netaddr>=0.10.1
 pre-commit>=3.6.0

requirements.txt

@@ -39,6 +39,8 @@ cryptography==41.0.7
     # via ansible-core
 distlib==0.3.8
     # via virtualenv
+distro==1.9.0
+    # via selinux
 enrich==1.2.7
     # via molecule
 filelock==3.13.1
@@ -53,6 +55,7 @@ jinja2==3.1.3
     # via
     #   ansible-core
     #   molecule
+    #   molecule-vagrant
 jmespath==1.0.1
     # via -r requirements.in
 jsonpatch==1.33
@@ -76,8 +79,8 @@ mdurl==0.1.2
 molecule==6.0.3
     # via
     #   -r requirements.in
-    #   molecule-plugins
+    #   molecule-vagrant
-molecule-plugins[vagrant]==23.5.0
+molecule-vagrant==2.0.0
     # via -r requirements.in
 netaddr==0.10.1
     # via -r requirements.in
@@ -113,7 +116,7 @@ pygments==2.17.2
 python-dateutil==2.8.2
     # via kubernetes
 python-vagrant==1.0.0
-    # via molecule-plugins
+    # via molecule-vagrant
 pyyaml==6.0.1
     # via
     #   -r requirements.in
@@ -121,6 +124,7 @@ pyyaml==6.0.1
     #   ansible-core
     #   kubernetes
     #   molecule
+    #   molecule-vagrant
     #   pre-commit
 referencing==0.32.1
     # via
@@ -148,6 +152,8 @@ ruamel-yaml==0.18.5
     # via pre-commit-hooks
 ruamel-yaml-clib==0.2.8
     # via ruamel-yaml
+selinux==0.3.0
+    # via molecule-vagrant
 six==1.16.0
     # via
     #   kubernetes