diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3dfcda27..3d03247f 100644 --- a/.github/workflows/ci.yml +++ b/.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/chef-install@3.0.0 - - name: Kitchen Converge - uses: actionshub/test-kitchen@3.0.0 - 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/test-kitchen@3.0.0 - 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}} diff --git a/kitchen.macos.local.yml b/kitchen.macos.local.yml index 9de6bec9..071b95cd 100644 --- a/kitchen.macos.local.yml +++ b/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] diff --git a/kitchen.macos.yml b/kitchen.macos.yml index 76e45ee5..0b6a7052 100644 --- a/kitchen.macos.yml +++ b/kitchen.macos.yml @@ -20,7 +20,7 @@ platforms: gui: false suites: - - name: openjdk-17 + - name: default run_list: - recipe[test::openjdk] attributes: