diff --git a/test/e2e_node/jenkins/docker_validation/jenkins-perf.properties b/test/e2e_node/jenkins/docker_validation/jenkins-perf.properties new file mode 100644 index 0000000000..833e7a0a9b --- /dev/null +++ b/test/e2e_node/jenkins/docker_validation/jenkins-perf.properties @@ -0,0 +1,22 @@ +#!/bin/bash +GCI_IMAGE_PROJECT=container-vm-image-staging +GCI_IMAGE_FAMILY=gci-canary-test +GCI_IMAGE=$(gcloud compute images describe-from-family ${GCI_IMAGE_FAMILY} --project=${GCI_IMAGE_PROJECT} --format="value(name)") +DOCKER_VERSION=$(curl -fsSL --retry 3 https://api.github.com/repos/docker/docker/releases | tac | tac | grep -m 1 "\"tag_name\"\:" | grep -Eo "[0-9\.rc-]+") +GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml + +# Render the test config file +GCE_IMAGE_CONFIG_PATH=`mktemp` +CONFIG_FILE=test/e2e_node/jenkins/docker_validation/perf-config.yaml +cp $CONFIG_FILE $GCE_IMAGE_CONFIG_PATH +sed -i -e "s@{{IMAGE}}@${GCI_IMAGE}@g" $GCE_IMAGE_CONFIG_PATH +sed -i -e "s@{{IMAGE_PROJECT}}@${GCI_IMAGE_PROJECT}@g" $GCE_IMAGE_CONFIG_PATH +sed -i -e "s@{{METADATA}}@user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION}@g" $GCE_IMAGE_CONFIG_PATH + +GCE_HOSTS= +GCE_ZONE=us-central1-f +GCE_PROJECT=k8s-jkns-ci-node-e2e +CLEANUP=true +GINKGO_FLAGS='--skip="\[Flaky\]"' +SETUP_NODE=true +PARALLELISM=1 diff --git a/test/e2e_node/jenkins/jenkins-docker-validation.properties b/test/e2e_node/jenkins/docker_validation/jenkins-validation.properties similarity index 92% rename from test/e2e_node/jenkins/jenkins-docker-validation.properties rename to test/e2e_node/jenkins/docker_validation/jenkins-validation.properties index 4e0753c8ee..c0dca01d4c 100644 --- a/test/e2e_node/jenkins/jenkins-docker-validation.properties +++ b/test/e2e_node/jenkins/docker_validation/jenkins-validation.properties @@ -13,6 +13,5 @@ GCE_PROJECT=k8s-jkns-ci-node-e2e # gci-docker-version specifies docker version in GCI image. GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION}" CLEANUP=true -# TODO(random-liu): Run performance test in docker validation test. GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"' SETUP_NODE=true diff --git a/test/e2e_node/jenkins/docker_validation/perf-config.yaml b/test/e2e_node/jenkins/docker_validation/perf-config.yaml new file mode 100644 index 0000000000..0200a6e916 --- /dev/null +++ b/test/e2e_node/jenkins/docker_validation/perf-config.yaml @@ -0,0 +1,58 @@ +--- +images: + containervm-density1: + image: "{{IMAGE}}" + project: "{{IMAGE_PROJECT}}" + metadata: "{{METADATA}}" + machine: n1-standard-1 + tests: + - '.*create 35 pods with 0s? interval \[Benchmark\]' + containervm-density2: + image: "{{IMAGE}}" + project: "{{IMAGE_PROJECT}}" + metadata: "{{METADATA}}" + machine: n1-standard-1 + tests: + - '.*create 105 pods with 0s? interval \[Benchmark\]' + containervm-density3: + image: "{{IMAGE}}" + project: "{{IMAGE_PROJECT}}" + metadata: "{{METADATA}}" + machine: n1-standard-2 + tests: + - '.*create 105 pods with 0s? interval \[Benchmark\]' + containervm-density4: + image: "{{IMAGE}}" + project: "{{IMAGE_PROJECT}}" + metadata: "{{METADATA}}" + machine: n1-standard-1 + tests: + - '.*create 35 pods with 100ms interval \[Benchmark\]' + containervm-density5: + image: "{{IMAGE}}" + project: "{{IMAGE_PROJECT}}" + metadata: "{{METADATA}}" + machine: n1-standard-1 + tests: + - '.*create 105 pods with 100ms interval \[Benchmark\]' + containervm-density6: + image: "{{IMAGE}}" + project: "{{IMAGE_PROJECT}}" + metadata: "{{METADATA}}" + machine: n1-standard-2 + tests: + - '.*create 105 pods with 100ms interval \[Benchmark\]' + containervm-density7: + image: "{{IMAGE}}" + project: "{{IMAGE_PROJECT}}" + metadata: "{{METADATA}}" + machine: n1-standard-1 + tests: + - '.*create 105 pods with 300ms interval \[Benchmark\]' + containervm-density8: + image: "{{IMAGE}}" + project: "{{IMAGE_PROJECT}}" + metadata: "{{METADATA}}" + machine: n1-standard-2 + tests: + - '.*create 105 pods with 300ms interval \[Benchmark\]'