Merge pull request #7946 from sbueringer/pr-test-e2e-dont-restart-con…

…formance-image

🐛 test/e2e: don't restart the conformance test container after ginkgo exits

test/framework/kubetest/run.go

@@ -190,6 +190,8 @@ func Run(ctx context.Context, input RunInput) error {
 		EnvironmentVars: env,
 		CommandArgs:     args,
 		Entrypoint:      []string{"/usr/local/bin/ginkgo"},
+		// We don't want the conformance test container to restart once ginkgo exits.
+		RestartPolicy: "no",
 	}, ginkgo.GinkgoWriter)
 	if err != nil {
 		return errors.Wrap(err, "Unable to run conformance tests")

test/infrastructure/container/docker.go

@@ -372,6 +372,11 @@ func (d *dockerRuntime) RunContainer(ctx context.Context, runConfig *RunContaine
 		Volumes:      map[string]struct{}{},
 	}
 
+	restartPolicy := runConfig.RestartPolicy
+	if restartPolicy == "" {
+		restartPolicy = "unless-stopped"
+	}
+
 	hostConfig := dockercontainer.HostConfig{
 		// Running containers in a container requires privileges.
 		// NOTE: we could try to replicate this with --cap-add, and use less
@@ -383,7 +388,7 @@ func (d *dockerRuntime) RunContainer(ctx context.Context, runConfig *RunContaine
 		NetworkMode:   dockercontainer.NetworkMode(runConfig.Network),
 		Tmpfs:         runConfig.Tmpfs,
 		PortBindings:  nat.PortMap{},
-		RestartPolicy: dockercontainer.RestartPolicy{Name: "unless-stopped"},
+		RestartPolicy: dockercontainer.RestartPolicy{Name: restartPolicy},
 	}
 	networkConfig := network.NetworkingConfig{}
 

test/infrastructure/container/interface.go

@@ -95,6 +95,9 @@ type RunContainerInput struct {
 	PortMappings []PortMapping
 	// IPFamily is the IP version to use.
 	IPFamily clusterv1.ClusterIPFamily
+	// RestartPolicy to use for the container.
+	// If not set, defaults to "unless-stopped".
+	RestartPolicy string
 }
 
 // ExecContainerInput contains values for running exec on a container.