Fix MacOS suite

Signed-off-by: Dan Webb <[email protected]>

.github/workflows/ci.yml

@@ -56,45 +56,8 @@ jobs:
           suite: ${{ matrix.suite }}
           os: ${{ matrix.os }}
 
-  integration-macos:
-    needs: "lint-unit"
-    runs-on: macos-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Install Chef
-        uses: actionshub/[email protected]
-      - name: Kitchen Converge
-        uses: actionshub/[email protected]
-        env:
-          CHEF_LICENSE: accept-no-persist
-          KITCHEN_LOCAL_YAML: kitchen.macos.yml
-          TERM: xterm-256color
-        with:
-          suite: temurin-11
-          os: macos
-          action: converge
-      - name: Source Profile for JAVA_HOME
-        run: |
-          source /etc/profile
-          echo "sourced profile for JAVA_HOME"
-          echo "New JAVA home after Chef run is: ${JAVA_HOME}"
-          # Magic line for github actions to persist the change
-          echo "JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV
-      - name: Kitchen Verify
-        uses: actionshub/[email protected]
-        env:
-          CHEF_LICENSE: accept-no-persist
-          KITCHEN_LOCAL_YAML: kitchen.macos.yml
-          TERM: xterm-256color
-        with:
-          suite: temurin-11
-          os: macos
-          action: verify
-
   final:
     runs-on: ubuntu-latest
-    needs: [integration, integration-macos]
+    needs: [integration]
     steps:
       - run: echo ${{needs.integration.outputs}}
-      - run: echo ${{needs.integration-macos.outputs}}

kitchen.macos.local.yml

@@ -13,13 +13,13 @@ platforms:
       gui: false
 
 suites:
-  - name: adoptopenjdk-14
+  - name: default
     run_list:
       - recipe[homebrew]
-      - recipe[test::adoptopenjdk]
+      - recipe[test::openjdk]
     attributes:
       version: 14
       variant: openj9
     verifier:
-      inspec_tests: [test/integration/adoptopenjdk]
-      input_files: [test/integration/adoptopenjdk/inputs/adoptopenjdk-14-macos.yml]
+      inspec_tests: [test/integration/openjdk]
+      input_files: [test/integration/openjdk/inputs/openjdk-14-macos.yml]

kitchen.macos.yml

@@ -20,7 +20,7 @@ platforms:
       gui: false
 
 suites:
-  - name: openjdk-17
+  - name: default
     run_list:
       - recipe[test::openjdk]
     attributes: