Update ingegration tests for container runtimes

kubernetes · Dec 19, 2020 · 786459a · 786459a
1 parent 7c2d916
commit 786459a
Show file tree

Hide file tree

Showing 37 changed files with 7,480 additions and 42 deletions.
diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go
@@ -326,9 +326,22 @@ func TestMixedInstancesSpotASG(t *testing.T) {
 	newIntegrationTest("mixedinstances.example.com", "mixed_instances_spot").withZones(3).runTestCloudformation(t)
 }
 
-// TestContainerdCloudformation runs the test on a containerd configuration
-func TestContainerdCloudformation(t *testing.T) {
-	newIntegrationTest("containerd.example.com", "containerd-cloudformation").runTestCloudformation(t)
+// TestContainerd runs the test on a containerd configuration
+func TestContainerd(t *testing.T) {
+	newIntegrationTest("containerd.example.com", "containerd").runTestTerraformAWS(t)
+	newIntegrationTest("containerd.example.com", "containerd").runTestCloudformation(t)
+}
+
+// TestContainerdCustom runs the test on a custom containerd URL configuration
+func TestContainerdCustom(t *testing.T) {
+	newIntegrationTest("containerd.example.com", "containerd-custom").runTestTerraformAWS(t)
+	newIntegrationTest("containerd.example.com", "containerd-custom").runTestCloudformation(t)
+}
+
+// TestDockerCustom runs the test on a custom Docker URL configuration
+func TestDockerCustom(t *testing.T) {
+	newIntegrationTest("docker.example.com", "docker-custom").runTestTerraformAWS(t)
+	newIntegrationTest("docker.example.com", "docker-custom").runTestCloudformation(t)
 }
 
 // TestLaunchConfigurationASG tests ASGs using launch configurations instead of launch templates

diff --git a/...ainerd-cloudformation/cloudformation.json → ...ter/containerd-custom/cloudformation.json b/...ainerd-cloudformation/cloudformation.json → ...ter/containerd-custom/cloudformation.json