This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch release/1.9.1 in repository https://gitbox.apache.org/repos/asf/geode.git
commit a137e27373ce0cfc13e7b4e4809e77958935b355 Author: Sean Goller <sgol...@pivotal.io> AuthorDate: Thu May 30 11:06:52 2019 -0700 Update windows image and tweaks to support it. (#3649) * Something changed in awt.dll in Java 11 and integration tests no longer complete under Windows Server Core. * Use Windows Server 2016, install docker and container support. * Fix execute_tests.sh so that DUnit options are not included when running tests that are not using DUnit. Authored-by: Sean Goller <sgol...@pivotal.io> (cherry picked from commit ec08f36920d101dd34c4b4c40c720855fa8fe975) --- .../windows-packer.json | 25 ++++++++++++++++------ ci/scripts/execute_tests.sh | 3 +-- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ci/images/google-windows-geode-builder/windows-packer.json b/ci/images/google-windows-geode-builder/windows-packer.json index 0c666b0..4c6ee0c 100644 --- a/ci/images/google-windows-geode-builder/windows-packer.json +++ b/ci/images/google-windows-geode-builder/windows-packer.json @@ -17,9 +17,9 @@ "project_id": "{{user `gcp_project`}}", "network": "{{user `gcp_network`}}", "subnetwork": "{{user `gcp_subnetwork`}}", - "source_image_family": "windows-1809-core-for-containers", + "source_image_family": "windows-2016", "disk_size": "100", - "machine_type": "n1-standard-1", + "machine_type": "n1-standard-4", "communicator": "winrm", "winrm_username": "geode", "winrm_insecure": true, @@ -40,7 +40,20 @@ "inline": [ "$ErrorActionPreference = \"Stop\"", "Set-ExecutionPolicy Bypass -Scope Process -Force", - + "Install-WindowsFeature Containers", + "Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force", + "Install-Module DockerMsftProvider -Force", + "Install-Package Docker -ProviderName DockerMsftProvider -Force" + ] + }, + { + "type": "windows-restart" + }, + { + "type": "powershell", + "inline": [ + "$ErrorActionPreference = \"Stop\"", + "Set-ExecutionPolicy Bypass -Scope Process -Force", "Invoke-WebRequest https://chocolatey.org/install.ps1 -UseBasicParsing | Invoke-Expression", "choco install -y git rsync adoptopenjdk11", "Move-Item \"C:\\Program Files\\AdoptOpenJDK\\jdk-11*\" c:\\java11", @@ -67,10 +80,10 @@ "write-output '>>>>>>>>>> Modify sshd config to comment use of administrators authorized key file <<<<<<<<<<'", "(Get-Content \"C:\\Program Files\\OpenSSH-Win64\\sshd_config_default\") -replace '(Match Group administrators)', '#$1' -replace '(\\s*AuthorizedKeysFile.*)', '#$1' | Out-File \"C:\\Program Files\\OpenSSH-Win64\\sshd_config_default\" -encoding UTF8", "write-output '>>>>>>>>>> Adding openjdk docker image <<<<<<<<<<'", - "docker pull openjdk:8u181-jdk-windowsservercore-1709", + "docker pull openjdk:8u212-jdk-windowsservercore-1809", "write-output '>>>>>>>>>> Removing unused docker images <<<<<<<<<<'", - "docker rmi microsoft/windowsservercore:1709", - "docker rmi microsoft/nanoserver:1709", + "docker rmi microsoft/windowsservercore:1809", + "docker rmi microsoft/nanoserver:1809", "Set-Content -Path c:\\ProgramData\\docker\\config\\daemon.json -Value '{ \"hosts\": [\"tcp://0.0.0.0:2375\", \"npipe://\"] }'", diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh index 42c4e1b..515a9c6 100755 --- a/ci/scripts/execute_tests.sh +++ b/ci/scripts/execute_tests.sh @@ -54,7 +54,7 @@ scp ${SSH_OPTIONS} ${SCRIPTDIR}/capture-call-stacks.sh geode@${INSTANCE_IP_ADDRE if [[ -n "${PARALLEL_DUNIT}" && "${PARALLEL_DUNIT}" == "true" ]]; then - PARALLEL_DUNIT="-PparallelDunit -PdunitDockerUser=geode" + PARALLEL_DUNIT="-PparallelDunit -PdunitDockerUser=geode -PdunitDockerImage=\$(docker images --format '{{.Repository}}:{{.Tag}}')" if [ -n "${DUNIT_PARALLEL_FORKS}" ]; then DUNIT_PARALLEL_FORKS="-PdunitParallelForks=${DUNIT_PARALLEL_FORKS}" fi @@ -90,7 +90,6 @@ GRADLE_ARGS=" \ -PtestJVMVer=${JAVA_TEST_VERSION} \ ${PARALLEL_DUNIT} \ ${DUNIT_PARALLEL_FORKS} \ - -PdunitDockerImage=\$(docker images --format '{{.Repository}}:{{.Tag}}') \ ${DEFAULT_GRADLE_TASK_OPTIONS} \ ${GRADLE_SKIP_TASK_OPTIONS} \ ${GRADLE_TASK} \