Fix: Switch to buildx builder (#405)

* Switch to Buildx builder * Update platforms * Disable ServerSpec --------- Signed-off-by: Dan Webb <[email protected]>
test-kitchen · Nov 15, 2023 · e6edb34 · e6edb34
1 parent 14c3e93
commit e6edb34
Show file tree

Hide file tree

Showing 9 changed files with 433 additions and 378 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,27 +62,33 @@ jobs:
         with:
           ruby-version: "3.1"
           bundler-cache: true
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
 
   integration-linux:
     name: Linux ${{matrix.suite}} ${{matrix.os}}
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     needs: unit
     strategy:
       fail-fast: false
       matrix:
-        suite: [default, context, capabilities, arm64, amd64, inspec]
+        suite:
+          - default
+          - no-build-context
+          - arm64
+          - amd64
+          - inspec
         os:
           - amazonlinux-2
-          - ubuntu-18.04
-          - ubuntu-20.04
+          - ubuntu-1804
+          - ubuntu-2004
           - fedora-latest
           - centos-7
-          - centos-8
           - oraclelinux-7
           - rockylinux-8
-          - debian-9
-          - debian-10
+          - debian-11
+          - debian-12
           - opensuse-15
           - dockerfile
     steps:
@@ -91,4 +97,28 @@ jobs:
         with:
           ruby-version: "3.1"
           bundler-cache: true
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
+
+  integration-capabilities:
+    name: Linux ${{matrix.suite}} ${{matrix.os}}
+    runs-on: ubuntu-latest
+    needs: unit
+    strategy:
+      fail-fast: false
+      matrix:
+        suite:
+          - capabilities
+        os: [debian-11, ubuntu-1804, ubuntu-2004]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.1"
+          bundler-cache: true
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -0,0 +1,10 @@
+require:
+  - chefstyle
+
+AllCops:
+  TargetRubyVersion: 3.1
+  Include:
+    - "**/*.rb"
+  Exclude:
+    - "vendor/**/*"
+    - "spec/**/*"
diff --git a/kitchen.yml b/kitchen.yml
@@ -24,8 +24,8 @@ platforms:
   - name: centos-7
   - name: oraclelinux-7
   - name: rockylinux-8
-  - name: debian-9
-  - name: debian-10
+  - name: debian-11
+  - name: debian-12
   - name: opensuse-15
     driver:
       image: opensuse/leap:15
@@ -38,21 +38,18 @@ platforms:
 
 suites:
   - name: default
-    excludes: [arch, debian-9]
-  - name: context
-    excludes: [arch, debian-9]
+  - name: no_build_context
     driver:
       build_context: false
   - name: capabilities
-    includes: [debian-10, ubuntu-18.04, ubuntu-20.04]
+    includes: [debian-11, ubuntu-18.04, ubuntu-20.04]
     driver:
       provision_command:
         - curl -L https://www.chef.io/chef/install.sh | bash
         - apt-get install -y net-tools
       cap_drop:
         - NET_ADMIN
   - name: arm64
-    excludes: [debian-9]
     driver:
       docker_platform: linux/arm64
   - name: amd64