Merge pull request #37392 from Random-Liu/final-cleanup-for-nct
Automatic merge from submit-queue Node Conformance Test: Final cleanup for node conformance test. This PR fits node conformance test with recent change. * Remove `--manifest-path` because the test will get kubelet configuration through `/configz` now. https://github.com/kubernetes/kubernetes/pull/36919 * Add `$TEST_ARGS` so that we can override arguments inside the container. * Fix a bug in garbage_collector_test.go which will cause the framework tries to connect docker no matter running the test or not. @dashpole * Add `${REGISTRY}/node-test:${VERSION}` for convenience. * Bump up the image version to `0.2`. (the one released with v1.4 is `v0.1`) I've run the test both with `run_test.sh` script and directly `docker run`. Both of them passed. After this gets merged, I'll build and push the new test image. @dchen1107 /cc @kubernetes/sig-node
This commit is contained in:
@@ -257,7 +257,10 @@ func containerGCTest(f *framework.Framework, test testRun) {
|
||||
|
||||
// Runs containerGCTest using the docker runtime.
|
||||
func dockerContainerGCTest(f *framework.Framework, test testRun) {
|
||||
runtime := docker.ConnectToDockerOrDie(defaultDockerEndpoint, defaultRuntimeRequestTimeoutDuration)
|
||||
var runtime docker.DockerInterface
|
||||
BeforeEach(func() {
|
||||
runtime = docker.ConnectToDockerOrDie(defaultDockerEndpoint, defaultRuntimeRequestTimeoutDuration)
|
||||
})
|
||||
for _, pod := range test.testPods {
|
||||
// Initialize the getContainerNames function to use the dockertools api
|
||||
thisPrefix := pod.containerPrefix
|
||||
|
Reference in New Issue
Block a user