Skip to content

K
k3s
Commit b71ca669 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46309 from Random-Liu/move-docker-validation-to-separate-project

Automatic merge from submit-queue (batch tested with PRs 46299, 46309, 46311, 46303, 46150) Move docker validation test to separate project. Docker validation test is leaking VMs because new docker version `DOCKER_VERSION=17.05.0-c` totally breaks the new gci image `GCE_IMAGES=gci-test-60-9579-0-0` with the `gci-docker-version` metadata specified. The test successfully created the instance, but timed out when checking VM aliveness, and leaked the VM. I've cleaned up all leaked VMs. This PR moves docker validation node e2e test into a separate project to not influencing other node e2e test. @kewu1992 We should fix the docker automated validation test. /cc @dchen1107 @yujuhong @abgworrall
parents 3c2e6a9f dc023144
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/e2e_node/jenkins/docker_validation/jenkins-perf.properties
View file @ b71ca669
...@@ -15,7 +15,7 @@ sed -i -e "s@{{METADATA}}@user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKE ...@@ -15,7 +15,7 @@ sed -i -e "s@{{METADATA}}@user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKE
GCE_HOSTS= GCE_HOSTS=
GCE_ZONE=us-central1-f GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-ci-node-e2e GCE_PROJECT=node-cos-docker-validation-ci
CLEANUP=true CLEANUP=true
GINKGO_FLAGS='--skip="\[Flaky\]"' GINKGO_FLAGS='--skip="\[Flaky\]"'
PARALLELISM=1 PARALLELISM=1
test/e2e_node/jenkins/docker_validation/jenkins-validation.properties
View file @ b71ca669
...@@ -8,7 +8,7 @@ GCE_HOSTS= ...@@ -8,7 +8,7 @@ GCE_HOSTS=
GCE_IMAGES=${GCI_IMAGE} GCE_IMAGES=${GCI_IMAGE}
GCE_IMAGE_PROJECT=${GCI_IMAGE_PROJECT} GCE_IMAGE_PROJECT=${GCI_IMAGE_PROJECT}
GCE_ZONE=us-central1-f GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-ci-node-e2e GCE_PROJECT=node-cos-docker-validation-ci
# user-data is the GCI cloud init config file. # user-data is the GCI cloud init config file.
# gci-docker-version specifies docker version in GCI image. # gci-docker-version specifies docker version in GCI image.
GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION},gci-update-strategy=update_disabled" GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION},gci-update-strategy=update_disabled"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment