Skip to content

Commit

Permalink
skip more OpenJ9 roles
Browse files Browse the repository at this point in the history
  • Loading branch information
gdams committed Oct 15, 2024
1 parent c8a0de2 commit 73b83db
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion ansible/docker/Dockerfile.win2022
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM mcr.microsoft.com/windows/servercore:ltsc2022
WORKDIR /infrastructure

# Specify this with --build-arg PW=SomePassword
ARG PW=T3mp=Passwd
Expand Down Expand Up @@ -49,7 +50,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"]
Expand Down
16 changes: 8 additions & 8 deletions ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 73b83db

Please sign in to comment.