Merge branch 'ajwalker/remove-windows-21h1' into 'main'

Remove Windows 21H1

Closes #30924

See merge request https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4045

Merged-by: Arran Walker <[email protected]>
Approved-by: Tomasz Maczukin <[email protected]>

Author: saracen

.gitlab/ci/_common.gitlab-ci.yml

@@ -180,23 +180,6 @@ default:
   variables:
     WINDOWS_VERSION: nanoserver20H2
 
-.windows21H1_variables:
-  variables:
-    WINDOWS_VERSION: servercore21H1
-
-.windows21H1:
-  extends:
-  - .windows21H1_variables
-  tags:
-  - windows
-  - windows-21h1
-
-.windows21H1_nano:
-  extends:
-  - .windows21H1
-  variables:
-    WINDOWS_VERSION: nanoserver21H1
-
 # .stage_done is used as a sentinel at stage n for stage n-1 completion, so we can kick off builds in later stages
 # without explicitly waiting for the completion of the n-1 stage
 .stage_done:

.gitlab/ci/coverage.gitlab-ci.yml

@@ -106,20 +106,6 @@ check windows 1809 unexpected integration test failures:
   needs:
   - windows 1809 integration tests
 
-check windows 21H1 unexpected unit test failures:
-  extends:
-  - .check windows unexpected test failures
-  - .rules:merge_request_pipelines:no_docs:no-community-mr
-  needs:
-    - windows 21H1 unit tests
-
-check windows 21H1 unexpected integration test failures:
-  extends:
-  - .check windows unexpected test failures
-  - .rules:merge_request_pipelines:no_docs:no-community-mr
-  needs:
-    - windows 21H1 integration tests
-
 .check windows test failures:
   stage: coverage
   script:
@@ -139,14 +125,6 @@ check windows 1809 unit test failures:
   needs:
   - windows 1809 unit tests
 
-check windows 21H1 unit test failures:
-  extends:
-  - .check windows test failures
-  - .windows21H1_variables
-  - .rules:merge_request_pipelines:no_docs:no-community-mr
-  needs:
-    - windows 21H1 unit tests
-
 check windows 1809 integration test failures:
   extends:
   - .check windows test failures
@@ -170,11 +148,3 @@ check windows 20H2 integration test failures:
   - .rules:merge_request_pipelines:no_docs:no-community-mr
   needs:
   - windows 20H2 integration tests
-
-check windows 21H1 integration test failures:
-  extends:
-  - .check windows test failures
-  - .windows21H1_variables
-  - .rules:merge_request_pipelines:no_docs:no-community-mr
-  needs:
-  - windows 21H1 integration tests

.gitlab/ci/prerelease.gitlab-ci.yml

@@ -80,26 +80,6 @@ development nanoserver20H2 helper docker images:
     PUSH_TO_DOCKER_HUB: "false"
     PUSH_TO_ECR_PUBLIC: "false"
 
-development servercore21H1 helper docker images:
-  extends:
-    - .windows21H1
-    - .release_windows_docker_images
-    - .rules:release:development:merge-requests:no-community-mr
-    - .docker_images_registry_base_variables_overwrite
-  variables:
-    PUSH_TO_DOCKER_HUB: "false"
-    PUSH_TO_ECR_PUBLIC: "false"
-
-development nanoserver21H1 helper docker images:
-  extends:
-    - .windows21H1_nano
-    - .release_windows_docker_images
-    - .rules:release:development:merge-requests:no-community-mr
-    - .docker_images_registry_base_variables_overwrite
-  variables:
-    PUSH_TO_DOCKER_HUB: "false"
-    PUSH_TO_ECR_PUBLIC: "false"
-
 bleeding edge servercore1809 helper docker images:
   extends:
     - .windows1809
@@ -160,26 +140,6 @@ bleeding edge nanoserver20H2 helper docker images:
     name: bleeding_edge/docker_images/windows20H2
     url: https://hub.docker.com/r/gitlab/gitlab-runner/tags/
 
-bleeding edge servercore21H1 helper docker images:
-  extends:
-    - .windows21H1
-    - .release_windows_docker_images
-    - .rules:release-or-security:bleeding-edge-or-stable
-    - .docker_images_registry_base_variables_overwrite
-  environment:
-    name: bleeding_edge/docker_images/windows21H1
-    url: https://hub.docker.com/r/gitlab/gitlab-runner/tags/
-
-bleeding edge nanoserver21H1 helper docker images:
-  extends:
-    - .windows21H1_nano
-    - .release_windows_docker_images
-    - .rules:release-or-security:bleeding-edge-or-stable
-    - .docker_images_registry_base_variables_overwrite
-  environment:
-    name: bleeding_edge/docker_images/windows21H1
-    url: https://hub.docker.com/r/gitlab/gitlab-runner/tags/
-
 stable servercore1809 helper docker images:
   extends:
     - .windows1809
@@ -240,22 +200,3 @@ stable nanoserver20H2 helper docker images:
     name: stable/docker_images/windows20H2
     url: https://hub.docker.com/r/gitlab/gitlab-runner/tags/
 
-stable servercore21H1 helper docker images:
-  extends:
-    - .windows21H1
-    - .release_windows_docker_images
-    - .rules:release:stable:branch
-    - .docker_images_registry_base_variables_overwrite
-  environment:
-    name: stable/docker_images/windows21H1
-    url: https://hub.docker.com/r/gitlab/gitlab-runner/tags/
-
-stable nanoserver21H1 helper docker images:
-  extends:
-    - .windows21H1_nano
-    - .release_windows_docker_images
-    - .rules:release:stable:branch
-    - .docker_images_registry_base_variables_overwrite
-  environment:
-    name: stable/docker_images/windows21H1
-    url: https://hub.docker.com/r/gitlab/gitlab-runner/tags/

.gitlab/ci/test.gitlab-ci.yml

@@ -303,12 +303,6 @@ windows 1809 unit tests:
   - .windows1809
   - .rules:merge_request_pipelines:no_docs
 
-windows 21H1 unit tests:
-  extends:
-  - .windows unit test
-  - .windows21H1
-  - .rules:merge_request_pipelines:no_docs:no-community-mr
-
 windows 1809 integration tests:
   extends:
   - .windows integration test
@@ -357,22 +351,6 @@ windows 20H2 integration tests:
   - job: 'stable servercore20H2 helper docker images'
     optional: true
 
-windows 21H1 integration tests:
-  extends:
-  - .windows integration test
-  - .windows21H1
-  - .rules:merge_request_pipelines:no_docs:no-community-mr
-  needs:
-  - 'integration test definitions'
-  - 'clone test repo'
-  - 'prepare done'
-  - job: 'development servercore21H1 helper docker images'
-    optional: true
-  - job: 'bleeding edge servercore21H1 helper docker images'
-    optional: true
-  - job: 'stable servercore21H1 helper docker images'
-    optional: true
-
 git 1.8.3.1:
   extends:
   - .rules:merge_request_pipelines:no_docs