Merge 069b9b1371 into edf0c9eebd

.github/workflows/cache.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   molecule:
     name: cache
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     env:
       PYTHON_VERSION: "3.11"
 
@@ -30,15 +30,15 @@ jobs:
       #     restore-keys: |
       #       ansible-
 
-      - name: Install dependencies
-        run: |
-          echo "::group::Upgrade pip"
-          python3 -m pip install --upgrade pip
-          echo "::endgroup::"
+      # - name: Install dependencies
+      #   run: |
+      #     echo "::group::Upgrade pip"
+      #     python3 -m pip install --upgrade pip
+      #     echo "::endgroup::"
 
-          echo "::group::Install Python requirements from requirements.txt"
-          python3 -m pip install -r requirements.txt
-          echo "::endgroup::"
+      #     echo "::group::Install Python requirements from requirements.txt"
+      #     python3 -m pip install -r requirements.txt
+      #     echo "::endgroup::"
 
       # - name: Install ansible dependencies
       #   if: steps.cache-ansible.outputs.cache-hit != 'true' # only run if false since this is just a cache step
@@ -58,11 +58,11 @@ jobs:
           restore-keys: |
             vagrant-boxes
 
-      - name: install apt packages
-        run: |
-          wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
-          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 apt packages
+      #   run: |
+      #     wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
+      #     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: Configure Homebrew cache

.github/workflows/lint.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   pre-commit-ci:
     name: Pre-Commit
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     env:
       PYTHON_VERSION: "3.11"
 
@@ -42,7 +42,7 @@ jobs:
 
   ensure-pinned-actions:
     name: Ensure SHA Pinned Actions
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     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: self-hosted
     strategy:
       matrix:
         scenario:
@@ -58,11 +58,11 @@ jobs:
       #     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
-          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 apt packages
+      #   run: |
+      #     wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
+      #     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: Restore vagrant Boxes cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0

molecule/default/molecule.yml

@@ -9,8 +9,8 @@ platforms:
 
   - name: control1
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 4096
+    cpus: 4
     groups:
       - k3s_cluster
       - master
@@ -25,8 +25,8 @@ platforms:
 
   - name: control2
     box: generic/debian11
-    memory: 512
-    cpus: 1
+    memory: 4096
+    cpus: 4
     groups:
       - k3s_cluster
       - master
@@ -36,8 +36,8 @@ platforms:
 
   - name: control3
     box: generic/rocky9
-    memory: 512
-    cpus: 1
+    memory: 4096
+    cpus: 4
     groups:
       - k3s_cluster
       - master
@@ -47,8 +47,8 @@ platforms:
 
   - name: node1
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 4096
+    cpus: 4
     groups:
       - k3s_cluster
       - node
@@ -63,8 +63,8 @@ platforms:
 
   - name: node2
     box: generic/rocky9
-    memory: 512
-    cpus: 1
+    memory: 4096
+    cpus: 4
     groups:
       - k3s_cluster
       - node

molecule/ipv6/molecule.yml

@@ -8,8 +8,8 @@ driver:
 platforms:
   - name: control1
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 4096
+    cpus: 4
     groups:
       - k3s_cluster
       - master
@@ -24,8 +24,8 @@ platforms:
 
   - name: control2
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 4096
+    cpus: 4
     groups:
       - k3s_cluster
       - master
@@ -40,8 +40,8 @@ platforms:
 
   - name: node1
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 4096
+    cpus: 4
     groups:
       - k3s_cluster
       - node

molecule/single_node/molecule.yml

@@ -8,8 +8,8 @@ driver:
 platforms:
   - name: control1
     box: generic/ubuntu2204
-    memory: 512
-    cpus: 1
+    memory: 8192
+    cpus: 8
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,
       # see: https://github.com/chef/bento/issues/1405