Merge branch 'master' into alburgess/oras-identity2

Azure · Jan 23, 2025 · 7c03c1a · 7c03c1a
2 parents c546369 + 38df0e5
commit 7c03c1a
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/e2e/scenario_test.go b/e2e/scenario_test.go
@@ -976,6 +976,22 @@ func Test_Ubuntu2204_ContainerdURL(t *testing.T) {
 	})
 }
 
+func Test_Ubuntu2204_ContainerdURL_Scriptless(t *testing.T) {
+	RunScenario(t, &Scenario{
+		Description: "tests that a node using the Ubuntu 2204 VHD with the ContainerdPackageURL override the provided URL and not the components.json containerd version",
+		Config: Config{
+			Cluster: ClusterKubenet,
+			VHD:     config.VHDUbuntu2204Gen2Containerd,
+			AKSNodeConfigMutator: func(config *aksnodeconfigv1.Configuration) {
+				config.ContainerdConfig.ContainerdPackageUrl = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/moby-containerd/moby-containerd_1.6.9+azure-ubuntu22.04u1_amd64.deb"
+			},
+			Validator: func(ctx context.Context, s *Scenario) {
+				ValidateInstalledPackageVersion(ctx, s, "containerd", "1.6.9")
+			},
+		},
+	})
+}
+
 func Test_Ubuntu2204_ContainerdHasCurrentVersion(t *testing.T) {
 	RunScenario(t, &Scenario{
 		Description: "tests that a node using an Ubuntu2204 VHD and the ContainerdVersion override bootstraps with the correct components.json containerd version and ignores the override",