From be33f3df4d955f0b89d413b4b5a278ce37da0f6a Mon Sep 17 00:00:00 2001 From: "robert.tomczyk" Date: Fri, 27 Nov 2020 16:09:19 +0000 Subject: [PATCH] GEODE: Fix old CLI integration tests geode-native on Windows Change-Id: I8ef0232e4d638b7fb8d850ca9bbf66700e3b54bf --- .../apache-geode-native-win-slave-setup.yaml | 8 ++++---- .../apache-geode-native-win-slave/slave-win-setup.ps1 | 10 +++++----- .../apache-geode-native-win-verify.yaml | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jjb/geode-native-win/apache-geode-native-win-slave/apache-geode-native-win-slave-setup.yaml b/jjb/geode-native-win/apache-geode-native-win-slave/apache-geode-native-win-slave-setup.yaml index 896e8ddf..3f624b68 100644 --- a/jjb/geode-native-win/apache-geode-native-win-slave/apache-geode-native-win-slave-setup.yaml +++ b/jjb/geode-native-win/apache-geode-native-win-slave/apache-geode-native-win-slave-setup.yaml @@ -37,13 +37,13 @@ default: '2.6.4' description: Version of NUnit .Net test framework for geode-native tests on Windows - string: - name: DOTNET_VERSION + name: DEV_DOTNET_VERSION default: '4.5.2' description: Version of .NET Framework development platform for geode-native on Windows - string: - name: DOGTAIL_DOTNET_VERSION - default: '3.5sp1' - description: Version of Dogtail .NET Framework development platform for geode-native on Windows + name: DOTNET_VERSION + default: '3.5' + description: Version of .NET Framework for geode-native on Windows. (Version 3 is required for Old CLI Integration Tests) - string: name: GEODE_SERVER_PATH default: 'C:\GeodeServer' diff --git a/jjb/geode-native-win/apache-geode-native-win-slave/slave-win-setup.ps1 b/jjb/geode-native-win/apache-geode-native-win-slave/slave-win-setup.ps1 index 754d8ad6..6d4496a9 100644 --- a/jjb/geode-native-win/apache-geode-native-win-slave/slave-win-setup.ps1 +++ b/jjb/geode-native-win/apache-geode-native-win-slave/slave-win-setup.ps1 @@ -89,12 +89,12 @@ Install-Choco -PackageName openssl Write-Host "Install CMake, version: latest" Install-Choco -PackageName cmake.portable -Write-Host "Install Dogtail, version: ${ENV:DOGTAIL_DOTNET_VERSION}" -Install-Choco -PackageName dogtail.dotnet${ENV:DOGTAIL_DOTNET_VERSION} +Write-Host "Install Dogtail, version: ${ENV:DOTNET_VERSION}" +Install-Choco -PackageName dotnet${ENV:DOTNET_VERSION} -Write-Host "Install .NET Framework and DevPack, version: ${ENV:DOTNET_VERSION}" -Install-Choco -PackageName "dotnet${ENV:DOTNET_VERSION}" -Install-Choco -PackageName "netfx-${ENV:DOTNET_VERSION}-devpack" -ArgumentList "--allowEmptyChecksums","-confirm" +Write-Host "Install .NET Framework and DevPack, version: ${ENV:DEV_DOTNET_VERSION}" +Install-Choco -PackageName "dotnet${ENV:DEV_DOTNET_VERSION}" +Install-Choco -PackageName "netfx-${ENV:DEV_DOTNET_VERSION}-devpack" -ArgumentList "--allowEmptyChecksums","-confirm" Write-Host "Install GNU Win32 Core utilities, version: latest" Install-Choco -PackageName gnuwin32-coreutils.portable diff --git a/jjb/geode-native-win/apache-geode-native-win-verify.yaml b/jjb/geode-native-win/apache-geode-native-win-verify.yaml index 57a9551a..e072dce8 100644 --- a/jjb/geode-native-win/apache-geode-native-win-verify.yaml +++ b/jjb/geode-native-win/apache-geode-native-win-verify.yaml @@ -52,13 +52,13 @@ default: '2.6.4' description: Version of NUnit .Net test framework for geode-native tests on Windows - string: - name: DOTNET_VERSION + name: DEV_DOTNET_VERSION default: '4.5.2' description: Version of .NET Framework development platform for geode-native on Windows - string: - name: DOGTAIL_DOTNET_VERSION - default: '3.5sp1' - description: Version of Dogtail .NET Framework development platform for geode-native on Windows + name: DOTNET_VERSION + default: '3.5' + description: Version of .NET Framework for geode-native on Windows. (Version 3 is required for Old CLI Integration Tests) - string: name: MSVC_TOOLSET_VERSION default: '14.25' -- 2.25.1