From b4057925b44edcc18b9bf275237c543adb4651d6 Mon Sep 17 00:00:00 2001 From: igorpeshansky Date: Wed, 11 Oct 2023 17:42:31 -0400 Subject: [PATCH] Remove references to Windows 2012 R2 (now EOL). (#1463) --- integration_test/gce/gce_testing.go | 2 +- kokoro/config/test/image_lists.gcl | 4 +--- .../config/test/third_party_apps/release/windows_x86_64.gcl | 3 +-- kokoro/config/test/third_party_apps/windows_x86_64.gcl | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/integration_test/gce/gce_testing.go b/integration_test/gce/gce_testing.go index e74dffca27..da0b288ecb 100644 --- a/integration_test/gce/gce_testing.go +++ b/integration_test/gce/gce_testing.go @@ -36,7 +36,7 @@ AGENT_PACKAGES_IN_GCS, for details see README.md. PROJECT=dev_project \ ZONES=us-central1-b \ - PLATFORMS=debian-10,centos-8,rhel-8-1-sap-ha,sles-15,ubuntu-2004-lts,windows-2012-r2,windows-2019 \ + PLATFORMS=debian-10,centos-8,rhel-8-1-sap-ha,sles-15,ubuntu-2004-lts,windows-2016,windows-2019 \ go test -v ops_agent_test.go \ -test.parallel=1000 \ -tags=integration_test \ diff --git a/kokoro/config/test/image_lists.gcl b/kokoro/config/test/image_lists.gcl index 55d0032671..0bcf9cf392 100644 --- a/kokoro/config/test/image_lists.gcl +++ b/kokoro/config/test/image_lists.gcl @@ -147,8 +147,6 @@ sles15_aarch64 = _distro { // Windows distros. windows_x86_64 = _distro { release = [ - 'windows-2012-r2', - 'windows-2012-r2-core', 'windows-2016', 'windows-2016-core', 'windows-2019', @@ -157,7 +155,7 @@ windows_x86_64 = _distro { 'windows-2022-core', ] presubmit = [ - 'windows-2012-r2', + 'windows-2016-core', // TODO(martijnvs): Switch this to windows-20h2-core. 'windows-2019', ] diff --git a/kokoro/config/test/third_party_apps/release/windows_x86_64.gcl b/kokoro/config/test/third_party_apps/release/windows_x86_64.gcl index 640cf2c110..d712f03fca 100644 --- a/kokoro/config/test/third_party_apps/release/windows_x86_64.gcl +++ b/kokoro/config/test/third_party_apps/release/windows_x86_64.gcl @@ -3,10 +3,9 @@ import 'common.gcl' as common config build = common.third_party_apps_test { params { platforms = [ - 'windows-2012-r2', 'windows-2019', 'sql-std-2019-win-2019', - 'windows-2022', + 'windows-2022', 'sql-std-2022-win-2022', ] } diff --git a/kokoro/config/test/third_party_apps/windows_x86_64.gcl b/kokoro/config/test/third_party_apps/windows_x86_64.gcl index 67d5b07ceb..b2c358e6d4 100644 --- a/kokoro/config/test/third_party_apps/windows_x86_64.gcl +++ b/kokoro/config/test/third_party_apps/windows_x86_64.gcl @@ -3,7 +3,7 @@ import 'common.gcl' as common config build = common.third_party_apps_test { params { platforms = [ - 'windows-2012-r2', + 'windows-2019', 'sql-std-2019-win-2019', ] }