From 8f21b16cbbfc120b3ccb8a458b4c58f236a3602c Mon Sep 17 00:00:00 2001 From: George Adams Date: Tue, 15 Oct 2024 16:26:16 +0100 Subject: [PATCH] skip more OpenJ9 roles --- .github/workflows/build_windows.yml | 6 +----- ansible/docker/Dockerfile.win2022 | 4 +++- .../AdoptOpenJDK_Windows_Playbook/main.yml | 16 ++++++++-------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 5f5139d10d..f863597109 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -39,11 +39,7 @@ jobs: subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - name: Build container image - run: docker build \ - -t adoptium.azurecr.io/windows2022_build_image:latest \ - --build-arg SOURCE_DIR=. \ - -f ansible/docker/Dockerfile.win2022 . \ - --output 'type=local,dest=C:\infrastructure' + run: docker build -t adoptium.azurecr.io/windows2022_build_image:latest -f ansible/docker/Dockerfile.win2022 . - name: Push container image to ACR if: github.ref == 'refs/heads/master' diff --git a/ansible/docker/Dockerfile.win2022 b/ansible/docker/Dockerfile.win2022 index a684bc68a3..84f74b6614 100644 --- a/ansible/docker/Dockerfile.win2022 +++ b/ansible/docker/Dockerfile.win2022 @@ -1,5 +1,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 +COPY . C:\infrastructure + # Specify this with --build-arg PW=SomePassword ARG PW=T3mp=Passwd @@ -49,7 +51,7 @@ RUN net user ansible %PW% /ADD & net localgroup "Administrators" ansible /ADD & echo localhost ansible_connection=winrm > infrastructure/ansible/hosts && \ cd C:\infrastructure\ansible && \ C:\cygwin64\bin\python3.7m.exe /usr/bin/ansible-playbook -e git_sha=00000000 -e ansible_user=ansible -e ansible_password=%PW% -i hosts \ - --skip-tags=adoptopenjdk,reboot,Windows_Updates,NTP_TIME,MSVS_2013,MSVS_2017,MSVS_2019 playbooks/AdoptOpenJDK_Windows_Playbook/main.yml && \ + --skip-tags=adoptopenjdk,reboot,Windows_Updates,NTP_TIME,MSVS_2013,Rust,IcedTea-Web playbooks/AdoptOpenJDK_Windows_Playbook/main.yml && \ net user ansible /DELETE ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"] diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml index 78d07893e6..8685f5143e 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml @@ -70,19 +70,19 @@ - ANT # Testing - role: MSVS_2013 when: ansible_architecture == "64-bit" - - role: MSVS_2017 # OpenJ9 - when: ansible_architecture == "64-bit" - - role: MSVS_2019 # OpenJ9 - tags: MSVS_2019 + # - role: MSVS_2017 # OpenJ9 + # when: ansible_architecture == "64-bit" + # - role: MSVS_2019 # OpenJ9 + # tags: MSVS_2019 - role: MSVS_2022 tags: MSVS_2022 - role: MSVS_2022_REDIST tags: MSVS_2022_REDIST - - NVidia_Cuda_Toolkit # OpenJ9 + # - NVidia_Cuda_Toolkit # OpenJ9 - NTP_TIME - - Clang_64bit # OpenJ9 - - Clang_32bit # OpenJ9 - - nasm # OpenJ9 + # - Clang_64bit # OpenJ9 + # - Clang_32bit # OpenJ9 + # - nasm # OpenJ9 - Rust # IcedTea-Web - IcedTea-Web # For Jenkins webstart - WiX # For creating installers