Skip to content

Conversation

@thaJeztah
Copy link
Member

follow-up to #42527
relates to #41479

Jenkinsfile Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until server template is updated this one need point to 10.0.20295.1

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@StefanScherer is there 20344 build version of server templates available already on Azure?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@olljanat I'll check if there are newer templates.
I checked a few weeks ago, but that version broke our packer build to prepare the custom VM image.
But I can try again and see if it works again.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@StefanScherer any news?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@olljanat Yes, I've created a new Azure VM image with Windows Server 2022 preview, Version 10.0.20348.51 and Docker 20.10.7 preinstalled. I cannot specify any other OS version.
Would this new VM image help you?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm. Official Windows Server Insider Preview download page offers 20344 build but they have later version on Azure? 😮

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I checked again a vanilla machine, but it's already 10.0.2348.51. 😿

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thaJeztah so can you update this one to use 10.0.20295.1 now and update both of those to latest on #42527 when new version is available?

Copy link
Contributor

@TBBle TBBle Jun 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Process isolation build IDs must match. If Host Build > Image Build, then Hyper-V isolation is the only option. And there's no base images for 20348 published yet to match the Windows Server 2022 Preview release on the Evaluation Center, so the latest Windows Server host we can use for process isolation is 20344 from the Windows Server Insiders Preview.

Edit: Sorry, some of this was already known, I didn't notice the fold in the comment history until after I wrote the comment.

tl;dr: 20344 is the latest Insider build available as ISO or VHDX. 20348 is the RTM build, currently only on the Evaluation Center, but that includes an Azure option as well as ISO.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated this PR to only add a new stage with the DOCKER_WINDOWS_CONTAINERD_RUNTIME env variable set, and we can use #42527 to update to more recent versions once things become available.

@thaJeztah thaJeztah force-pushed the jenkins_windows_containerd branch from 814cc02 to 9973dc6 Compare June 24, 2021 08:25
@thaJeztah
Copy link
Member Author

@thaJeztah so can you update this one to use 10.0.20295.1 now and update both of those to latest on #42527 when new version is available?

Updated to revert the version back to 10.0.20295.1 (and moving it out of draft) 👍

@thaJeztah thaJeztah marked this pull request as ready for review June 24, 2021 08:26
@thaJeztah thaJeztah added this to the 21.xx milestone Jun 25, 2021
Copy link
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

FWIW, the following (reversed) diff from the win-2022 stage above it helped me review this:

Diff:
diff --git a/Jenkinsfile b/Jenkinsfile
index 2cbe274c2d..6d7e9c4b92 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1257,7 +1257,7 @@ pipeline {
                 stage('win-2022-c8d') {
                     when {
                         beforeAgent true
-                        expression { params.windows2022containerd }
+                        expression { params.windows2022 }
                     }
                     environment {
                         DOCKER_BUILDKIT        = '0'
@@ -1269,9 +1269,7 @@ pipeline {
                         TESTRUN_SUBDIR         = "CI"
                         // TODO switch to mcr.microsoft.com/windows/servercore:2022 once published
                         WINDOWS_BASE_IMAGE     = 'mcr.microsoft.com/windows/servercore/insider'
-                        // Available tags can be found at https://mcr.microsoft.com/v2/windows/servercore/insider/tags/list
                         WINDOWS_BASE_IMAGE_TAG = '10.0.20295.1'
-                        DOCKER_WINDOWS_CONTAINERD_RUNTIME = '1'
                     }
                     agent {
                         node {
@@ -1303,7 +1301,7 @@ pipeline {
                             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE', message: 'Failed to create bundles.zip') {
                                 powershell '''
                                 cd $env:WORKSPACE
-                                $bundleName="win-2022-c8d-integration"
+                                $bundleName="win-2022-integration"
                                 Write-Host -ForegroundColor Green "Creating ${bundleName}-bundles.zip"
 
                                 # archiveArtifacts does not support env-vars to , so save the artifacts in a fixed location

Copy link
Contributor

@StefanScherer StefanScherer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member Author

I"ll take @StefanScherer's LGTM; let me go ahead and merge this one

@thaJeztah thaJeztah merged commit 665de2e into moby:master Jun 28, 2021
@thaJeztah thaJeztah deleted the jenkins_windows_containerd branch June 28, 2021 07:35
@StefanScherer
Copy link
Contributor

Thanks. I'll take care to not update the Windows 2022 machines in CI and keep them at 10.0.20295.1 until there is a matching base image.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants