From 360a6c42ec8c9b6a942ebbe71af4c14e047bd14f Mon Sep 17 00:00:00 2001 From: James Jerger <35977367+jjerger@users.noreply.github.com> Date: Thu, 12 Oct 2023 11:10:21 -0700 Subject: [PATCH] Remove 2012 R2 from prod windows build pipeline (#860) * Remove 2012 R2 from prod windows build pipeline EOS was October 10; these will no longer be used * Remove hard requirement for 2012R2 in daisy lib Removes dependency on EOS OS * Revert removal of 2012r2 secrets Leaving them in does no harm. Plus if they're needed in the future it's easier to re-implement this way. * Add iso_path back in Missed it in the first reversion --- .../pipelines/windows-image-build.jsonnet | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/concourse/pipelines/windows-image-build.jsonnet b/concourse/pipelines/windows-image-build.jsonnet index 959ac971e..43ab898af 100644 --- a/concourse/pipelines/windows-image-build.jsonnet +++ b/concourse/pipelines/windows-image-build.jsonnet @@ -792,10 +792,6 @@ local ImgGroup(name, images, environments) = { local windows_11_images = [ 'windows-11-21h2-ent-x64', ], - local windows_2012_images = [ - 'windows-server-2012-r2-dc', - 'windows-server-2012-r2-dc-core', - ], local windows_2016_images = [ 'windows-server-2016-dc', 'windows-server-2016-dc-core', @@ -809,19 +805,13 @@ local ImgGroup(name, images, environments) = { 'windows-server-2022-dc-core', ], local sql_2014_images = [ - 'sql-2014-enterprise-windows-2012-r2-dc', 'sql-2014-enterprise-windows-2016-dc', - 'sql-2014-standard-windows-2012-r2-dc', - 'sql-2014-web-windows-2012-r2-dc', ], local sql_2016_images = [ - 'sql-2016-enterprise-windows-2012-r2-dc', 'sql-2016-enterprise-windows-2016-dc', 'sql-2016-enterprise-windows-2019-dc', - 'sql-2016-standard-windows-2012-r2-dc', 'sql-2016-standard-windows-2016-dc', 'sql-2016-standard-windows-2019-dc', - 'sql-2016-web-windows-2012-r2-dc', 'sql-2016-web-windows-2016-dc', 'sql-2016-web-windows-2019-dc', ], @@ -829,7 +819,6 @@ local ImgGroup(name, images, environments) = { 'sql-2017-enterprise-windows-2016-dc', 'sql-2017-enterprise-windows-2019-dc', 'sql-2017-enterprise-windows-2022-dc', - 'sql-2017-express-windows-2012-r2-dc', 'sql-2017-express-windows-2016-dc', 'sql-2017-express-windows-2019-dc', 'sql-2017-standard-windows-2016-dc', @@ -871,7 +860,7 @@ local ImgGroup(name, images, environments) = { ], local windows_client_images = windows_10_images + windows_11_images, - local windows_server_images = windows_2012_images + windows_2016_images + windows_2019_images + local windows_server_images = windows_2016_images + windows_2019_images + windows_2022_images, local sql_images = sql_2014_images + sql_2016_images + sql_2017_images + sql_2019_images + sql_2022_images, @@ -933,30 +922,21 @@ local ImgGroup(name, images, environments) = { ImgBuildJob('windows-server-2019-dc-core', 'win2019-64', 'windows_gcs_updates_server2019'), ImgBuildJob('windows-server-2016-dc', 'win2016-64', 'windows_gcs_updates_server2016'), ImgBuildJob('windows-server-2016-dc-core', 'win2016-64', 'windows_gcs_updates_server2016'), - ImgBuildJob('windows-server-2012-r2-dc', 'win2012-r2-64', 'windows_gcs_updates_server2012r2'), - ImgBuildJob('windows-server-2012-r2-dc-core', 'win2012-r2-64', 'windows_gcs_updates_server2012r2'), // SQL derivative builds - SQLImgBuildJob('sql-2014-enterprise-windows-2012-r2-dc', 'windows-server-2012-r2-dc', 'sql-2014-enterprise', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2014-enterprise-windows-2016-dc', 'windows-server-2016-dc', 'sql-2014-enterprise', 'windows_gcs_ssms_exe'), - SQLImgBuildJob('sql-2014-standard-windows-2012-r2-dc', 'windows-server-2012-r2-dc', 'sql-2014-standard', 'windows_gcs_ssms_exe'), - SQLImgBuildJob('sql-2014-web-windows-2012-r2-dc', 'windows-server-2012-r2-dc', 'sql-2014-web', 'windows_gcs_ssms_exe'), - SQLImgBuildJob('sql-2016-enterprise-windows-2012-r2-dc', 'windows-server-2012-r2-dc', 'sql-2016-enterprise', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2016-enterprise-windows-2016-dc', 'windows-server-2016-dc', 'sql-2016-enterprise', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2016-enterprise-windows-2019-dc', 'windows-server-2019-dc', 'sql-2016-enterprise', 'windows_gcs_ssms_exe'), - SQLImgBuildJob('sql-2016-standard-windows-2012-r2-dc', 'windows-server-2012-r2-dc', 'sql-2016-standard', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2016-standard-windows-2016-dc', 'windows-server-2016-dc', 'sql-2016-standard', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2016-standard-windows-2019-dc', 'windows-server-2019-dc', 'sql-2016-standard', 'windows_gcs_ssms_exe'), - SQLImgBuildJob('sql-2016-web-windows-2012-r2-dc', 'windows-server-2012-r2-dc', 'sql-2016-web', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2016-web-windows-2016-dc', 'windows-server-2016-dc', 'sql-2016-web', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2016-web-windows-2019-dc', 'windows-server-2019-dc', 'sql-2016-web', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2017-enterprise-windows-2016-dc', 'windows-server-2016-dc', 'sql-2017-enterprise', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2017-enterprise-windows-2019-dc', 'windows-server-2019-dc', 'sql-2017-enterprise', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2017-enterprise-windows-2022-dc', 'windows-server-2022-dc', 'sql-2017-enterprise', 'windows_gcs_ssms_exe'), - SQLImgBuildJob('sql-2017-express-windows-2012-r2-dc', 'windows-server-2012-r2-dc', 'sql-2017-express', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2017-express-windows-2016-dc', 'windows-server-2016-dc', 'sql-2017-express', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2017-express-windows-2019-dc', 'windows-server-2019-dc', 'sql-2017-express', 'windows_gcs_ssms_exe'), SQLImgBuildJob('sql-2017-standard-windows-2016-dc', 'windows-server-2016-dc', 'sql-2017-standard', 'windows_gcs_ssms_exe'), @@ -1054,7 +1034,6 @@ local ImgGroup(name, images, environments) = { groups: [ ImgGroup('windows-10', windows_10_images, client_envs), ImgGroup('windows-11', windows_11_images, client_envs), - ImgGroup('windows-2012', windows_2012_images, server_envs), ImgGroup('windows-2016', windows_2016_images, server_envs), ImgGroup('windows-2019', windows_2019_images, server_envs), ImgGroup('windows-2022', windows_2022_images, server_envs),