From 2c3bd2ff3de30f722edd4e4933cf5a3901b4f92a Mon Sep 17 00:00:00 2001 From: Martijn Verburg Date: Mon, 17 Jan 2022 10:03:38 +0000 Subject: [PATCH 1/2] Remove deprecated Windows 2016 Docker image (O/S no longer in support) --- .github/workflows/build_windows.yml | 44 -------------- FAQ.md | 24 ++++---- ansible/docker/Dockerfile.Windows2016_Base | 61 -------------------- ansible/docker/Dockerfile.Windows2016_VS2017 | 19 ------ ansible/pbTestScripts/vmDestroy.sh | 2 +- ansible/vagrant/Vagrantfile.Win2016 | 2 +- 6 files changed, 15 insertions(+), 137 deletions(-) delete mode 100644 .github/workflows/build_windows.yml delete mode 100644 ansible/docker/Dockerfile.Windows2016_Base delete mode 100644 ansible/docker/Dockerfile.Windows2016_VS2017 diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml deleted file mode 100644 index d545754cb0..0000000000 --- a/.github/workflows/build_windows.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Docker Windows - -on: - pull_request: - paths: - - .github/workflows/build_windows.yml - - ansible/docker/DockerFile.Windows2016_Base - - ansible/docker/Dockerfile.Windows2016_VS2017 - branches: - - master - push: - paths: - - .github/workflows/build_windows.yml - - ansible/docker/DockerFile.Windows2016_Base - - ansible/docker/Dockerfile.Windows2016_VS2017 - branches: - - master - -jobs: - build-and-push-windows2016: - name: Windows 2016 - runs-on: windows-2016 - steps: - - - uses: actions/checkout@v2 - - - name: Docker Build Windows 2016 Base Image to Docker Hub - run: docker build -t adoptopenjdk/windows2016_build_image:base -f ansible/docker/Dockerfile.windows2016_Base . - - - name: Docker Build Windows 2016 VS2017 Image to Docker Hub - run: docker build -t adoptopenjdk/windows2016_build_image:vs2017 -f ansible/docker/Dockerfile.windows2016_VS2017 . - - - name: Docker login - uses: azure/docker-login@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - if: github.ref == 'refs/heads/master' - - - name: Push Windows images to Docker Hub - run: | - docker push adoptopenjdk/windows2016_build_image:base - docker push adoptopenjdk/windows2016_build_image:vs2017 - if: github.ref == 'refs/heads/master' diff --git a/FAQ.md b/FAQ.md index 903db1b564..75163f15c8 100644 --- a/FAQ.md +++ b/FAQ.md @@ -73,8 +73,6 @@ have at the moment: | [Centos7](./ansible/docker/Dockerfile.CentOS7) | [`adoptopenjdk/centos7_build_image`](https://hub.docker.com/r/adoptopenjdk/centos7_build_image) | linux on x64, arm64, ppc64le, armv7l | [Jenkins](https://ci.adoptopenjdk.net/job/centos7_docker_image_updater/) | Yes | [Centos6](./ansible/docker/Dockerfile.CentOS6) | [`adoptopenjdk/centos6_build_image`](https://hub.docker.com/r/adoptopenjdk/centos6_build_image)| linux/amd64 | [GH Actions](.github/workflows/build.yml) | Yes | [Alpine3](./ansible/docker/Dockerfile.Alpine3) | [`adoptopenjdk/alpine3_build_image`](https://hub.docker.com/r/adoptopenjdk/alpine3_build_image) | linux/amd64 | [GH Actions](.github/workflows/build.yml) | Yes -| [Windows2016_Base](./ansible/docker/Dockerfile.Windows2016_Base) | [`adoptopenjdk/windows2016_build_image:base`](https://hub.docker.com/r/adoptopenjdk/windows2016_build_image)| windows/amd64 | [GH Actions](.github/workflows/build_windows.yml) | No -| [Windows2016_VS2017](./ansible/docker/Dockerfile.Windows2016_VS2017) | [`adoptopenjdk/windows2016_build_image:vs2017`](https://hub.docker.com/r/adoptopenjdk/windows2016_build_image)| windows/amd64 | [GH Actions](.github/workflows/build_windows.yml) | No When a change lands into master, the relevant dockerfiles are built using the appropriate CI system listed in the table above by configuring them with @@ -112,10 +110,11 @@ as an example The build triage team will frequently raise issues if they determine that a build failure is occurring on a particular system. Assuming it's not a -"system is offline" issue you may wish to repliacte the build process +"system is offline" issue you may wish to replicate the build process locally. The easiest way to do this is as follows (ideally not as root as that can mask problems). -``` + +```sh git clone https://github.com/adoptopenjdk/openjdk-build cd openjdk-build/build-farm export CONFIGURE_ARGS=--with-native-debug-symbols=none @@ -157,7 +156,7 @@ For more information on test case diagnosis, there is a full [Triage guide](https://github.com/AdoptOpenJDK/openjdk-tests/blob/master/doc/Triage.md) in the openjdk-tests repository -The values for `TARGET` can be found in thte `` elements of +The values for `TARGET` can be found in the `` elements of .the various `playlist.xml` files in the test repositories. It can also be `jdk_custom` which case you should set the `CUSTOM_TARGET` to the name of an individual test for example: @@ -166,13 +165,14 @@ an individual test for example: If you then need to run manually on the machine itself (outside jenkins) then the process is typically like this: -``` +```sh git clone https://github.com/adoptopenjdk/openjdk-tests && cd openjdk-tests ./get.sh && cd TKG export TEST_JDK_HOME= BUILD_LIST=openjdk make compile make ``` + `BUILD_LIST` depends on the suite you want to run, and can be omitted to build the tests for everything, but that make take a while and requires `docker` to be available. Note that when building the `system` suite, there must be @@ -182,6 +182,7 @@ is more information on running tests yourself in the [tests repository](https://github.com/AdoptOpenJDK/openjdk-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline) A few examples that test specific pieces of infra-related functionality so useful to be aware of: + - `BUILD_LIST=functional`, `CUSTOM_TARGET=_MBCS_Tests_pref_ja_JP_linux_0` - `BUILD_LIST=system`, `CUSTOM_TARGET=_MachineInfo` - `BUILD_LIST=openjdk`, `CUSTOM_TARGET=test/jdk/java/lang/invoke/lambda/LambdaFileEncodingSerialization.java` (`en_US.utf8` locale required) @@ -280,7 +281,8 @@ cases they may be used as `dockerBuild` hosts too. Instructions on how to create a static docker container can be found [here](https://github.com/adoptium/infrastructure/blob/dockerstatic.docs/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/README.md) -### DockerHost TODO: +### DockerHost TODO + 1. Set up patching cycle 2. Identify ways to redeploy when needed to pick up updates 3. Allow dockerhost.yml playbook to adjust core file settings @@ -288,8 +290,8 @@ Instructions on how to create a static docker container can be found [here](http ## Temporary access to a machine -In some occasions non-infrastruture team members may wish to access a -machine in order to reporoduce a test case failure, particularly if they do +In some occasions non-infrastructure team members may wish to access a +machine in order to reproduce a test case failure, particularly if they do not have access to a machine of any given platform, or if the problem appears to be specific to a particular machine or cloud provider. In this case, the following procedure should be followed. Example commands are @@ -297,9 +299,9 @@ suitable for most UNIX-based platforms: 1. User should raise a request for access using [this template](https://github.com/adoptium/infrastructure/issues/new?assignees=sxa&labels=Temp+Infra+Access&template=machineaccess.md&title=Access+request+for+%3Cyour+username%3E) - (in general, "Non-privilieged" is the correct option to choose + (in general, "Non-privileged" is the correct option to choose 2. Infrastructure team member doing the following steps should assign the issue to themselves -3. For non-privilieged users, create an account with a GECOS field referencing the requester and issue number e.g. `useradd -m -c "Stewart Addison 1234" sxa` +3. For non-privileged users, create an account with a GECOS field referencing the requester and issue number e.g. `useradd -m -c "Stewart Addison 1234" sxa` 4. Add the user's key to `.ssh/authorized_keys` on the machine with the user's public ssh key in it 5. Add a comment to the issue with the username and IP address details 6. The issue should be left open until the user is finished with the machine (if it has been a while, ask them in the issue) diff --git a/ansible/docker/Dockerfile.Windows2016_Base b/ansible/docker/Dockerfile.Windows2016_Base deleted file mode 100644 index 3b65a90109..0000000000 --- a/ansible/docker/Dockerfile.Windows2016_Base +++ /dev/null @@ -1,61 +0,0 @@ -# escape=` - -FROM mcr.microsoft.com/windows/servercore:ltsc2016 - -SHELL ["powershell", "-command"] - -# Workaround for https://github.com/moby/moby/issues/41058 -ENV CYGWIN winsymlinks:lnk -ADD .github/cygwin-build/setup-x86_64.exe C:\temp\cygwin.exe - -RUN $ProgressPreference = 'SilentlyContinue'; ` - # Enable 8dot3 shortnames - fsutil behavior set disable8dot3 0; ` - fsutil file setshortname 'c:\program files (x86)' 'PROGRA~2'; ` - # pre install - New-Item -Path C:\ -Name 'openjdk' -ItemType 'directory'; ` - # cygwin - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - # Invoke-WebRequest -UseBasicParsing 'https://cygwin.com/setup-x86_64.exe' -OutFile 'C:\temp\cygwin.exe'; ` - Start-Process -Wait -FilePath 'C:\temp\cygwin.exe' -ArgumentList '--packages autoconf,automake,bsdtar,cpio,curl,gcc-core,git,gnupg,grep,libtool,make,mingw64-x86_64-gcc-core,perl,rsync,unzip,wget,zip --quiet-mode --download --no-admin --local-install --delete-orphans --site https://mirrors.kernel.org/sourceware/cygwin/ --local-package-dir C:\cygwin_packages --root C:\cygwin64'; ` - # change git config to not replace Line endings - C:\cygwin64\bin\git config --system core.autocrlf false ; ` - # perl - Invoke-WebRequest 'http://strawberryperl.com/download/5.26.0.1/strawberry-perl-5.26.0.1-64bit.zip' -OutFile C:\temp\strawberry-perl.zip; ` - Expand-Archive -LiteralPath C:\temp\strawberry-perl.zip -DestinationPath C:\Strawberry; ` - Start-Process -Wait -FilePath C:\Strawberry\perl\bin\perl -ArgumentList '-MCPAN -e "install Text::CSV_XS"'; ` - # git - Invoke-WebRequest 'http://github.com/git-for-windows/git/releases/download/v2.14.3.windows.1/Git-2.14.3-64-bit.exe' -OutFile C:\temp\git.exe; ` - Start-Process -Wait -FilePath C:\temp\git.exe -ArgumentList '/SILENT /COMPONENTS="icons,ext\reg\shellhere,assoc,assoc_sh"'; ` - # java 7 - Invoke-WebRequest 'http://download.java.net/openjdk/jdk7u75/ri/jdk_ri-7u75-b13-windows-i586-18_dec_2014.zip' -OutFile C:\temp\jdk7u75-b13.zip; ` - Expand-Archive -LiteralPath C:\temp\jdk7u75-b13.zip -DestinationPath 'C:\Program Files\Java'; ` - New-Item -ItemType SymbolicLink -Path C:\openjdk\jdk-7 -Target 'C:\Program Files\Java\java-se-7u75-ri'; ` - # java 8 - Invoke-WebRequest 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x86-32_windows_hotspot_8u265b01.zip' -OutFile C:\temp\jdk-8.zip; ` - Expand-Archive -LiteralPath C:\temp\jdk-8.zip -DestinationPath 'C:\Program Files\Java'; ` - New-Item -ItemType SymbolicLink -Path C:\openjdk\jdk-8 -Target 'C:\Program Files\Java\jdk8u265-b01'; ` - # java 10 - Invoke-WebRequest 'https://github.com/AdoptOpenJDK/openjdk10-binaries/releases/download/jdk-10.0.2%2B13.1/OpenJDK10U-jdk_x64_windows_hotspot_10.0.2_13.zip' -OutFile C:\temp\jdk-10.zip; ` - Expand-Archive -LiteralPath C:\temp\jdk-10.zip -DestinationPath 'C:\Program Files\Java'; ` - New-Item -ItemType SymbolicLink -Path C:\openjdk\jdk-10 -Target 'C:\Program Files\Java\jdk-10.0.2+13'; ` - # set env - [Environment]::SetEnvironmentVariable('JDK7_BOOT_DIR', '/cygdrive/c/openjdk/jdk-7', [EnvironmentVariableTarget]::Machine); ` - [Environment]::SetEnvironmentVariable('JDK8_BOOT_DIR', '/cygdrive/c/openjdk/jdk-8', [EnvironmentVariableTarget]::Machine); ` - [Environment]::SetEnvironmentVariable('JDK10_BOOT_DIR', '/cygdrive/c/openjdk/jdk-10', [EnvironmentVariableTarget]::Machine); ` - # ant - Invoke-WebRequest 'http://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip' -OutFile C:\temp\ant.zip; ` - Expand-Archive -LiteralPath C:\temp\ant.zip -DestinationPath C:\apache-ant\; ` - # ant-contrib - Invoke-WebRequest 'http://astuteinternet.dl.sourceforge.net/project/ant-contrib/ant-contrib/ant-contrib-1.0b2/ant-contrib-1.0b2-bin.zip' -OutFile C:\temp\ant-contrib.zip; ` - Expand-Archive -LiteralPath C:\temp\ant-contrib.zip -DestinationPath C:\temp\ant-contrib; ` - Copy-Item -Path C:\temp\ant-contrib\ant-contrib\lib\ant-contrib.jar -Destination C:\apache-ant\apache-ant-1.10.5\lib\ant-contrib.jar; ` - # set env - [Environment]::SetEnvironmentVariable('ANT_HOME', 'C:\apache-ant\apache-ant-1.10.5', [EnvironmentVariableTarget]::Machine); ` - [Environment]::SetEnvironmentVariable('JAVA_HOME', '/cygdrive/c/openjdk/jdk-8', [EnvironmentVariableTarget]::Machine); ` - [Environment]::SetEnvironmentVariable('HOME', 'C:\Users\ContainerAdministrator', [EnvironmentVariableTarget]::Machine); ` - # remove speech mark from the %PATH% - $NewPath=$env:path.Replace('\"',''); ` - [Environment]::SetEnvironmentVariable('Path', 'C:\Strawberry\perl\bin;C:\openjdk\jdk-8\bin;C:\apache-ant\apache-ant-1.10.5\bin;C:\cygwin64\bin;C:\Program Files\Git\bin;' + $NewPath, [EnvironmentVariableTarget]::Machine); ` - # clean up - Remove-Item C:\temp -Recurse diff --git a/ansible/docker/Dockerfile.Windows2016_VS2017 b/ansible/docker/Dockerfile.Windows2016_VS2017 deleted file mode 100644 index a4d64d3b7c..0000000000 --- a/ansible/docker/Dockerfile.Windows2016_VS2017 +++ /dev/null @@ -1,19 +0,0 @@ -# escape=` - -FROM adoptopenjdk/windows2016_build_image:base - -SHELL ["powershell", "-command"] - -RUN $ProgressPreference = 'SilentlyContinue'; ` - # pre install - New-Item -Path C:\ -Name 'temp' -ItemType 'directory'; ` - # VS2017 Build Tools - Invoke-WebRequest 'https://download.visualstudio.microsoft.com/download/pr/82e3dcda-e8a0-44e4-8860-eb93a12d4e80/debc235546e664edf27e81d2945921eb58e8bfec4f4e6eb271fecb9aca320b76/vs_BuildTools.exe' -OutFile C:\temp\vs2017.exe; ` - Start-Process -Wait -FilePath C:\temp\vs2017.exe -ArgumentList '--wait --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.Windows10SDK.17763 --quiet --norestart'; ` - regsvr32 /s 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\DIA SDK\bin\msdia140.dll'; ` - regsvr32 /s 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\DIA SDK\bin\amd64\msdia140.dll'; ` - fsutil file setshortname 'c:\program files (x86)\Microsoft Visual Studio' 'MIB055~1'; ` - # clean up - Remove-Item C:\temp -Recurse; ` - Remove-Item 'C:\ProgramData\Package Cache' -Recurse; ` - Remove-Item 'C:\ProgramData\Microsoft\VisualStudio\Packages' -Recurse diff --git a/ansible/pbTestScripts/vmDestroy.sh b/ansible/pbTestScripts/vmDestroy.sh index 6b37c3846f..117fb4c257 100755 --- a/ansible/pbTestScripts/vmDestroy.sh +++ b/ansible/pbTestScripts/vmDestroy.sh @@ -66,7 +66,7 @@ checkOS() { "Windows2016" | "Win2016" | "W16" | "w16" ) osToDestroy="W2016";; "all" ) - osToDestroy="U16 U18 U20 U21 C6 C7 C8 D8 D10 FBSD12 Sol10 W2012" ;; + osToDestroy="U16 U18 U20 U21 C6 C7 C8 D8 D10 FBSD12 Sol10 W2012 W2016" ;; "") echo "No OS detected. Did you miss the '-o' option?" ; usage; exit 1;; *) echo "$OS is not a currently supported OS" ; listOS; exit 1; diff --git a/ansible/vagrant/Vagrantfile.Win2016 b/ansible/vagrant/Vagrantfile.Win2016 index 04d592881d..6b02e9e1af 100644 --- a/ansible/vagrant/Vagrantfile.Win2016 +++ b/ansible/vagrant/Vagrantfile.Win2016 @@ -1,7 +1,7 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -# Runs Powershell as an administator and does the following: +# Runs Powershell as an administrator and does the following: # - Gets/executes an Ansible provided script that configures WinRM to allow Ansible to communicate over it. # - Resizes the disk to ~100GB, in line with the 'disksize.size = 100GB' option in the config below From 60238c862437f1be90eb37be4be51260d68811fe Mon Sep 17 00:00:00 2001 From: Martijn Verburg Date: Wed, 19 Jan 2022 16:06:21 +0000 Subject: [PATCH 2/2] remove all mention of 2016 Vagrant --- ansible/pbTestScripts/vagrantPlaybookCheck.sh | 7 +-- ansible/pbTestScripts/vmDestroy.sh | 7 +-- .../AdoptOpenJDK_Windows_Playbook/main.yml | 2 +- .../roles/NVidia_Cuda_Toolkit/tasks/main.yml | 6 +-- ansible/vagrant/Vagrantfile.Win2016 | 54 ------------------- 5 files changed, 7 insertions(+), 69 deletions(-) delete mode 100644 ansible/vagrant/Vagrantfile.Win2016 diff --git a/ansible/pbTestScripts/vagrantPlaybookCheck.sh b/ansible/pbTestScripts/vagrantPlaybookCheck.sh index 245035a428..08c624c9fd 100755 --- a/ansible/pbTestScripts/vagrantPlaybookCheck.sh +++ b/ansible/pbTestScripts/vagrantPlaybookCheck.sh @@ -168,11 +168,6 @@ checkVagrantOS() echo "Reducing the Windows VM memory requirement to 2560Mb." sed -i -e "s/5120/2560/g" Vagrantfile.Win2012 fi - if [[ "$vagrantOS" == "Win2016" && $(free | awk '/Mem:/ { print $2 }') -lt 8000000 ]]; then - echo "Warning: Windows VM requires 5Gb of free memory to run. On laptops with only 8Gb this can be an issue." - echo "Reducing the Windows VM memory requirement to 2560Mb." - sed -i -e "s/5120/2560/g" Vagrantfile.Win2016 - fi } setupWorkspace() @@ -401,7 +396,7 @@ checkVagrantOS echo "Testing on the following OSs: $vagrantOS" for OS in $vagrantOS do - if [[ "$OS" == "Win2012" ]] || [[ "$OS" == "Win2016" ]]; then + if [[ "$OS" == "Win2012" ]] ; then startVMPlaybookWin $OS else startVMPlaybook $OS diff --git a/ansible/pbTestScripts/vmDestroy.sh b/ansible/pbTestScripts/vmDestroy.sh index 117fb4c257..4d53ce8870 100755 --- a/ansible/pbTestScripts/vmDestroy.sh +++ b/ansible/pbTestScripts/vmDestroy.sh @@ -63,10 +63,8 @@ checkOS() { osToDestroy="Sol10" ;; "Windows2012" | "Win2012" | "W12" | "w12" ) osToDestroy="W2012";; - "Windows2016" | "Win2016" | "W16" | "w16" ) - osToDestroy="W2016";; "all" ) - osToDestroy="U16 U18 U20 U21 C6 C7 C8 D8 D10 FBSD12 Sol10 W2012 W2016" ;; + osToDestroy="U16 U18 U20 U21 C6 C7 C8 D8 D10 FBSD12 Sol10 W2012" ;; "") echo "No OS detected. Did you miss the '-o' option?" ; usage; exit 1;; *) echo "$OS is not a currently supported OS" ; listOS; exit 1; @@ -87,8 +85,7 @@ listOS() { - Debian10 - FreeBSD12 - Solaris10 - - Win2012 - - Win2016" + - Win2012" echo } diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml index 5e54fe69f9..4e7f777c00 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml @@ -2,7 +2,7 @@ ######################################## # AdoptOpenJDK - Ansible Playbook for: # # -------- Windows 7, 8, 10 --------- # -# - Windows Server 2008, 2012, 2016 - # +# - Windows Server 2008, 2012 - # ######################################## ################ diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml index a75d77485d..fd503546f0 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml @@ -29,7 +29,7 @@ when: (not cuda_installed.stat.exists) and (ansible_distribution_major_version == "5" or ansible_distribution_major_version == "6") tags: NVidia_Cuda_Toolkit -- name: Download NVidia CUDA toolkit - Windows 10 and Server 2016 +- name: Download NVidia CUDA toolkit - Windows 10 win_get_url: url: 'https://developer.nvidia.com/compute/cuda/9.0/Prod/network_installers/cuda_9.0.176_win10_network-exe' dest: 'C:\temp\cuda_9.0.176_win10_network-exe.exe' @@ -38,12 +38,12 @@ when: (not cuda_installed.stat.exists and ansible_distribution_major_version == "10") tags: NVidia_Cuda_Toolkit -- name: Install NVidia CUDA toolkit - Windows 10 and Server 2016 +- name: Install NVidia CUDA toolkit - Windows 10 win_shell: C:\temp\cuda_9.0.176_win10_network-exe.exe -s compiler_9.0 nvml_dev_9.0 when: (not cuda_installed.stat.exists and ansible_distribution_major_version == "10") tags: NVidia_Cuda_Toolkit -- name: Cleanup NVidia CUDA toolkit - Windows 10 and Server 2016 +- name: Cleanup NVidia CUDA toolkit - Windows 10 win_file: path: C:\temp\cuda_9.0.176_win10_network-exe.exe state: absent diff --git a/ansible/vagrant/Vagrantfile.Win2016 b/ansible/vagrant/Vagrantfile.Win2016 deleted file mode 100644 index 6b02e9e1af..0000000000 --- a/ansible/vagrant/Vagrantfile.Win2016 +++ /dev/null @@ -1,54 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# Runs Powershell as an administrator and does the following: -# - Gets/executes an Ansible provided script that configures WinRM to allow Ansible to communicate over it. -# - Resizes the disk to ~100GB, in line with the 'disksize.size = 100GB' option in the config below - -$script = <