Add MacOS support for AdoptOpenJDK (sous-chefs#597)

* Add MacOS support for AdoptOpenJDK
* Split out Linux into it's own install resource

Author: damacus

.github/workflows/branchcleanup.yml

@@ -40,78 +40,27 @@ jobs:
     strategy:
       matrix:
         os:
-          - amazon-linux
-          - amazonlinux-2
-          - debian-9
-          - debian-10
-          - centos-7
-          - ubuntu-1604
-          - ubuntu-1804
-          - ubuntu-2004
+          - 'amazon-linux'
+          - 'debian-9'
+          - 'debian-10'
+          - 'centos-7'
+          - 'ubuntu-1604'
+          - 'ubuntu-1804'
         suite:
-          - openjdk-11
-          - openjdk-12
-          - openjdk-13
-          - openjdk-pkg-7
-          - openjdk-pkg-8
-          - openjdk-pkg-11
-          - openjdk-pkg-13
-          - openjdk-pkg-latest
-          - adoptopenjdk-8-openj9
-          - adoptopenjdk-11-hotspot
-          - adoptopenjdk-11-openj9
-          - adoptopenjdk-11-openj9-large-heap
-          - adoptopenjdk-13-hotspot
-          - adoptopenjdk-13-openj9
-          - adoptopenjdk-13-openj9-large-heap
-          - adoptopenjdk-removal-11-openj9
-          - corretto-11
-          - corretto-8
-        exclude:
-          - os: amazon-linux
-            suite: openjdk-pkg-11
-          - os: amazon-linux
-            suite: openjdk-pkg-13
-          - os: amazon-linux
-            suite: openjdk-pkg-latest
-          - os: amazonlinux-2
-            suite: openjdk-pkg-13
-          - os: amazonlinux-2
-            suite: openjdk-pkg-latest
-          - os: centos-7
-            suite: openjdk-pkg-13
-          - os: centos-7
-            suite: openjdk-pkg-latest
-          - os: debian-9
-            suite: openjdk-pkg-7
-          - os: debian-9
-            suite: openjdk-pkg-11
-          - os: debian-9
-            suite: openjdk-pkg-13
-          - os: debian-9
-            suite: openjdk-pkg-latest
-          - os: debian-10
-            suite: openjdk-pkg-7
-          - os: debian-10
-            suite: openjdk-pkg-8
-          - os: debian-10
-            suite: openjdk-pkg-13
-          - os: debian-10
-            suite: openjdk-pkg-latest
-          - os: ubuntu-1604
-            suite: openjdk-pkg-latest
-          - os: ubuntu-1804
-            suite: openjdk-pkg-7
-          - os: ubuntu-1804
-            suite: openjdk-pkg-13
-          - os: ubuntu-1804
-            suite: openjdk-pkg-latest
-          - os: ubuntu-2004
-            suite: openjdk-pkg-7
-          - os: ubuntu-2004
-            suite: openjdk-pkg-latest
+          - 'openjdk-11'
+          - 'openjdk-12'
+          - 'openjdk-13'
+          - 'adoptopenjdk-8-openj9'
+          - 'adoptopenjdk-11-hotspot'
+          - 'adoptopenjdk-11-openj9'
+          - 'adoptopenjdk-11-openj9-large-heap'
+          - 'adoptopenjdk-14-hotspot'
+          - 'adoptopenjdk-14-openj9'
+          - 'adoptopenjdk-14-openj9-large-heap'
+          - 'adoptopenjdk-removal-11-openj9'
+          # - 'corretto-11'
+          # - 'corretto-8'
       fail-fast: false
-
     steps:
       - name: Check out code
         uses: actions/checkout@master
@@ -126,6 +75,27 @@ jobs:
           suite: ${{ matrix.suite }}
           os: ${{ matrix.os }}
 
+  macos:
+    needs: [mdl, yamllint, delivery]
+    runs-on: macos-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@master
+      - name: Install Chef
+        uses: actionshub/chef-install@master
+      - name: Run Test Kitchen
+        env:
+          CHEF_LICENSE: accept-no-persist
+          KITCHEN_LOCAL_YAML: kitchen.macos.yml
+          TERM: xterm-256color
+        run: |
+          kitchen converge adoptopenjdk-14-macos
+          source /etc/profile
+          echo "sourced profile for JAVA_HOME"
+          echo "New JAVA home after Chef run is: ${JAVA_HOME}"
+          kitchen verify adoptopenjdk-14-macos
+
+
   final:
     needs: [dokken]
     runs-on: ubuntu-latest

.github/workflows/ci.yml

@@ -3,5 +3,6 @@ source 'https://supermarket.chef.io'
 metadata
 
 group :integration do
+  cookbook 'homebrew'
   cookbook 'test', path: 'test/fixtures/cookbooks/test'
 end

Berksfile

@@ -4,13 +4,14 @@ This file is used to list changes made in each version of the Java cookbook.
 
 ## Unreleased
 
+- Added MacOS support for AdoptOpenJDK
+
+## 8.1.0 (tbc)
+
 - resolved cookstyle error: resources/alternatives.rb:49:13 refactor: `ChefCorrectness/ChefApplicationFatal`
 - resolved cookstyle error: resources/alternatives.rb:62:13 refactor: `ChefCorrectness/ChefApplicationFatal`
 - resolved cookstyle error: resources/alternatives.rb:75:11 refactor: `ChefCorrectness/ChefApplicationFatal`
 - resolved cookstyle error: resources/jce.rb:51:6 refactor: `ChefStyle/UnnecessaryOSCheck`
-
-## 8.1.0 (10-04-2020)
-
 - Added `openjdk_pkg_install` resource & documentation
 
 ## 8.0.1 (30-03-2020)
@@ -630,8 +631,8 @@ This version brings a wealth of tests and (backwards-compatible) refactoring, pl
 
 ## v1.5.4
 
-- [COOK-885] - update alternatives called on wrong file
-- [COOK-1607] - use shellout instead of execute resource to update alternatives
+- [COOK-885] update alternatives called on wrong file
+- [COOK-1607] use shellout instead of execute resource to update alternatives
 
 ## v1.5.2
 

CHANGELOG.md

@@ -0,0 +1,22 @@
+---
+provisioner:
+  name: chef_zero
+  install_strategy: skip
+  channel: current
+
+platforms:
+  - name: macos
+    driver:
+      box: damacus/macos-10.15.4
+      provider: parallels
+      linked_clone: true
+      gui: false
+
+suites:
+  - name: adoptopenjdk-14
+    run_list:
+      - recipe[homebrew]
+      - recipe[test::adoptopenjdk-14-openj9]
+    verifier:
+      inspec_tests: [test/integration/adoptopenjdk]
+      input_files: [test/integration/adoptopenjdk/attributes/adoptopenjdk-14-macos.yml]

kitchen.macos.local.yml

@@ -1,7 +1,29 @@
 ---
+driver:
+  name: exec
+  host: localhost
+
+provisioner:
+  require_chef_omnibus: false
+  name: chef_zero
+  install_strategy: skip
+  chef_client_path: "/opt/chef-workstation/bin/chef-client"
+  deprecations_as_errors: false
+  sudo: true
+
 platforms:
-  - name: macosx-10.10
+  - name: macos
     driver:
-      box: macosx-10.10
+      box: damacus/macos-10.15.4
+      provider: parallels
+      linked_clone: true
+      gui: false
+
+suites:
+  - name: adoptopenjdk-14
     run_list:
       - recipe[homebrew]
+      - recipe[test::adoptopenjdk-14-openj9]
+    verifier:
+      inspec_tests: [test/integration/adoptopenjdk]
+      input_files: [test/integration/adoptopenjdk/attributes/adoptopenjdk-14-macos.yml]

kitchen.macos.yml

@@ -0,0 +1,20 @@
+# ---
+# driver:
+#   name: exec
+#   host: localhost
+
+# provisioner:
+#   require_chef_omnibus: false
+#   # chef_client_path: "/opt/chef-workstation/bin/chef-client"
+#   name: chef_zero
+#   deprecations_as_errors: false
+#   log_level: :info
+#   install_strategy: skip
+
+# suites:
+#   - name: adoptopenjdk-13-openj9
+#     run_list:
+#       - recipe[test::adoptopenjdk-13-openj9]
+
+# platforms:
+#    - name: windows_2019

kitchen.windows.yml

@@ -5,7 +5,7 @@ driver:
 provisioner:
   name: chef_zero
   deprecations_as_errors: false
-  log_level: :info
+  # log_level: :info
 
 verifier:
   name: inspec
@@ -158,26 +158,26 @@ suites:
       inspec_tests: [test/integration/adoptopenjdk]
       input_files: [test/integration/adoptopenjdk/attributes/adoptopenjdk-11-openj9-large-heap.yml]
 
-  # Version 13
-  - name: adoptopenjdk-13-openj9-large-heap
+  # Version 14
+  - name: adoptopenjdk-14-openj9-large-heap
     run_list:
-      - recipe[test::adoptopenjdk-13-openj9-large-heap]
+      - recipe[test::adoptopenjdk-14-openj9-large-heap]
     verifier:
       inspec_tests: [test/integration/adoptopenjdk]
-      input_files: [test/integration/adoptopenjdk/attributes/adoptopenjdk-13-openj9-large-heap.yml]
-  - name: adoptopenjdk-13-openj9
+      input_files: [test/integration/adoptopenjdk/attributes/adoptopenjdk-14-openj9-large-heap.yml]
+  - name: adoptopenjdk-14-openj9
     run_list:
-      - recipe[test::adoptopenjdk-13-openj9]
+      - recipe[test::adoptopenjdk-14-openj9]
     verifier:
       inspec_tests:
         - test/integration/adoptopenjdk
-      input_files: [test/integration/adoptopenjdk/attributes/adoptopenjdk-13-openj9.yml]
-  - name: adoptopenjdk-13-hotspot
+      input_files: [test/integration/adoptopenjdk/attributes/adoptopenjdk-14-openj9.yml]
+  - name: adoptopenjdk-14-hotspot
     run_list:
-      - recipe[test::adoptopenjdk-13-hotspot]
+      - recipe[test::adoptopenjdk-14-hotspot]
     verifier:
       inspec_tests: [test/integration/adoptopenjdk]
-      input_files: [test/integration/adoptopenjdk/attributes/adoptopenjdk-13-hotspot.yml]
+      input_files: [test/integration/adoptopenjdk/attributes/adoptopenjdk-14-hotspot.yml]
 
   # 11 Removal
   - name: adoptopenjdk-removal-11-openj9

kitchen.yml

@@ -3,15 +3,21 @@ module Cookbook
     module AdoptOpenJdkHelpers
       def sub_dir(url)
         uri = URI.parse(url)
-        file_name = uri.path.split('/')[-2]
+        f = uri.path.split('/')[-2]
+        puts f
 
-        result = if file_name =~ /jdk8+/
-                   file_name.split('_').first
-                 else
-                   file_name.split('_').first.gsub('%2B', '+')
-                 end
+        case f
+        when /jdk8/
+          result = f.split('_').first
+        when /jdk-14/
+          result = f.split('_').first.gsub('%2B', '+')
+          result = result.slice(0..(result.index('.') - 1)) if result.include? '.'
+          result
+        else
+          result = f.split('_').first.gsub('%2B', '+')
+        end
 
-        raise("Failed to parse #{file_name} for directory name!") if result.empty?
+        raise("Failed to parse #{f} for directory name!") if result.empty?
 
         result
       end
@@ -21,15 +27,24 @@ def default_adopt_openjdk_url(version)
         when '8'
           { 'hotspot' => 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz',
             'openj9' => 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_linux_openj9_8u242b08_openj9-0.18.1.tar.gz',
-            'openj9-large-heap' => 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_linux_openj9_linuxXL_8u242b08_openj9-0.18.1.tar.gz' }
+            'openj9-large-heap' => 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_linux_openj9_linuxXL_8u242b08_openj9-0.18.1.tar.gz',
+          }
         when '11'
           { 'hotspot' => 'https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz',
             'openj9' => 'https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_linux_openj9_11.0.6_10_openj9-0.18.1.tar.gz',
-            'openj9-large-heap' => 'https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_linux_openj9_linuxXL_11.0.6_10_openj9-0.18.1.tar.gz' }
+            'openj9-large-heap' => 'https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_linux_openj9_linuxXL_11.0.6_10_openj9-0.18.1.tar.gz',
+           }
         when '13'
           { 'hotspot' => 'https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz',
             'openj9' => 'https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz',
-            'openj9-large-heap' => 'https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_linuxXL_13.0.2_8_openj9-0.18.0.tar.gz' }
+            'openj9-large-heap' => 'https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_linuxXL_13.0.2_8_openj9-0.18.0.tar.gz',
+          }
+        when '14'
+          {
+            'hotspot' => 'https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14%2B36/OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz',
+            'openj9' => 'https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14%2B36.1_openj9-0.19.0/OpenJDK14U-jdk_x64_linux_openj9_14_36_openj9-0.19.0.tar.gz',
+            'openj9-large-heap' => 'https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14%2B36.1_openj9-0.19.0/OpenJDK14U-jdk_x64_linux_openj9_linuxXL_14_36_openj9-0.19.0.tar.gz',
+          }
         else
           Chef::Log.fatal('Version specified does not have a URL value set')
         end
@@ -40,15 +55,23 @@ def default_adopt_openjdk_checksum(version)
         when '8'
           { 'hotspot' => 'f39b523c724d0e0047d238eb2bb17a9565a60574cf651206c867ee5fc000ab43',
             'openj9' => 'ca785af638b24f9d4df896f5a9f557cc9f1e5fa5e2b1174d6b906e3fd5474c2e',
-            'openj9-large-heap' => '6ee788d57f15cc8c326bb3468390d5e353cc1aac1925efa3f2992a93e2520d97' }
+            'openj9-large-heap' => '6ee788d57f15cc8c326bb3468390d5e353cc1aac1925efa3f2992a93e2520d97',
+          }
         when '11'
           { 'hotspot' => '330d19a2eaa07ed02757d7a785a77bab49f5ee710ea03b4ee2fa220ddd0feffc',
             'openj9' => '1530172ee98edd129954fcdca1bf725f7b30c8bfc3cdc381c88de96b7d19e690',
-            'openj9-large-heap' => '6524d85d2ce334c955a4347015567326067ef15fe5f6a805714b25cace256f40' }
+            'openj9-large-heap' => '6524d85d2ce334c955a4347015567326067ef15fe5f6a805714b25cace256f40',
+          }
         when '13'
           { 'hotspot' => '9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998',
             'openj9' => 'aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590',
-            'openj9-large-heap' => '16751b3951b808c4cb0b77d4df1a16f9bfff5b2dbc59919773e6386114e6d8d5' }
+            'openj9-large-heap' => '16751b3951b808c4cb0b77d4df1a16f9bfff5b2dbc59919773e6386114e6d8d5',
+          }
+        when '14'
+          { 'hotspot' => '6c06853332585ab58834d9e8a02774b388e6e062ef6c4084b4f058c67f2e81b5',
+            'openj9' => '106b72d565be98834ead5fea9555bd646d488a86fc4ae4dd294a38e97bf77509',
+            'openj9-large-heap' => '4ee13d0689ab7a38d6abb7dee974c3b189e36f1911a0cb61c882a38e61cc8b98',
+          }
         else
           Chef::Log.fatal('Version specified does not have a checksum value set')
         end
@@ -64,7 +87,7 @@ def default_adopt_openjdk_bin_cmds(version)
           { 'hotspot' => %w(jaotc jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jjs jlink jmap jmod jps jrunscript jshell jstack jstat jstatd keytool pack200 rmic rmid rmiregistry serialver unpack200),
             'openj9' => %w(jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jdmpview jextract jimage jitserver jjs jlink jmap jmod jps jrunscript jshell jstack jstat keytool pack200 rmic rmid rmiregistry serialver traceformat unpack200),
             'openj9-large-heap' => %w(jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jdmpview jextract jimage jitserver jjs jlink jmap jmod jps jrunscript jshell jstack jstat keytool pack200 rmic rmid rmiregistry serialver traceformat unpack200) }
-        when '13'
+        when '13', '14'
           { 'hotspot' => %w(jaotc jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jjs jlink jmap jmod jps jrunscript jshell jstack jstat jstatd keytool pack200 rmic rmid rmiregistry serialver unpack200),
             'openj9' => %w(jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jdmpview jextract jimage jjs jlink jmap jmod jps jrunscript jshell jstack jstat keytool pack200 rmic rmid rmiregistry serialver traceformat unpack200),
             'openj9-large-heap' => %w(jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jdmpview jextract jimage jjs jlink jmap jmod jps jrunscript jshell jstack jstat keytool pack200 rmic rmid rmiregistry serialver traceformat unpack200) }