Include msvs_2022

restore vs2017 params Update checksum for new vs2022 layout include dll registration for vs2022 layout install Fix MSVS_2022 logs Fix tags Fix DLL Registration Ensure install check is run Run check
adoptium · Sep 9, 2023 · 0f620e8 · 0f620e8
1 parent a845640
commit 0f620e8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
@@ -73,6 +73,8 @@
       when: ansible_architecture == "64-bit"
     - role: MSVS_2019                   # OpenJ9
       tags: MSVS_2019
+    - role: MSVS_2022                   # OpenJ9
+      tags: MSVS_2022
     - NVidia_Cuda_Toolkit         # OpenJ9
     - NTP_TIME
     - Clang_64bit                 # OpenJ9

diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2017/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2017/tasks/main.yml
@@ -21,7 +21,7 @@
   tags: MSVS_2017
 
 - name: Install Visual Studio Community 2017
-  win_shell: 'C:\temp\vs_community.exe --wait --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --includeOptional --quiet --norestart'
+  win_shell: 'C:\temp\vs_community.exe --wait --add Microsoft.VisualStudio.Workload.NativeDesktop;includeRecommended;includeOptional --quiet --norestart'
   args:
     executable: cmd
   when: (not vs2017_installed.stat.exists)

diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022/tasks/main.yml
@@ -28,12 +28,13 @@
 - name: Get SHA256 checksum of the file
   win_shell: |
     $filePath = "C:\TEMP\VS2022_Layout.zip"
-    $expectedChecksum = "7BEBEF0A67E01FA3DF718D019DE58C47FF24DF1A24CCE3DE5B1DD9E302C04F43"
-
+    $expectedChecksum = "29567E33B5361E4BAD36DFDFF83FEB3DDFDF0518122237E8273F0FA4E11E8B74"
     $actualChecksum = Get-FileHash -Path $filePath -Algorithm SHA256 | Select-Object -ExpandProperty Hash
 
     if ($actualChecksum -ne $expectedChecksum) {
         Write-Output "Checksum mismatch"
+        Write-Output "Actual Checksum: $actualChecksum"
+        Write-Output "Expect Checksum: $expectedChecksum"
         exit 1
     }
   register: checksum_result
@@ -110,12 +111,18 @@
     --add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --add Microsoft.VisualStudio.Component.VC.ATL.ARM64 --add Microsoft.VisualStudio.Component.VC.MFC.ARM64'
   when: (not vs2022_installed.stat.exists)
 
+- name: Test if VS 2022 is installed
+  win_stat:
+    path: 'C:\Program Files\Microsoft Visual Studio\2022\Community'
+  register: vs2022_now_installed
+  when: (not vs2022_installed.stat.exists)
+
 - name: Register Visual Studio Community 2022 DIA SDK shared libraries
   win_command: 'regsvr32 /s "{{ item }}"'
   with_items:
     - C:\Program Files\Microsoft Visual Studio\2022\Community\DIA SDK\bin\msdia140.dll
     - C:\Program Files\Microsoft Visual Studio\2022\Community\DIA SDK\bin\amd64\msdia140.dll
-  when: (not vs2022_installed.stat.exists)
+  when: (vs2022_now_installed.stat.exists)
 
 - name: Reboot machine after Visual Studio installation
   win_reboot: