github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable AU in node e2e test.

pull/6/head
Random-Liu 2016-12-15 01:33:09 -08:00
parent db867c0c9d
commit e5efc21de6
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/make-rules/test-e2e-node.sh
View File

@ -73,7 +73,7 @@ if [ $remote = true ] ; then
gci_image=$(gcloud compute images list --project $image_project \ gci_image=$(gcloud compute images list --project $image_project \
--no-standard-images --regexp="gci-dev.*" --format="table[no-heading](name)") --no-standard-images --regexp="gci-dev.*" --format="table[no-heading](name)")
images=$gci_image images=$gci_image
metadata="user-data<${KUBE_ROOT}/test/e2e_node/jenkins/gci-init.yaml" metadata="user-data<${KUBE_ROOT}/test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
fi fi
instance_prefix=${INSTANCE_PREFIX:-"test"} instance_prefix=${INSTANCE_PREFIX:-"test"}
cleanup=${CLEANUP:-"true"} cleanup=${CLEANUP:-"true"}

6
test/e2e_node/jenkins/benchmark/benchmark-config.yaml
View File

@ -52,21 +52,21 @@ images:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'resource tracking for 0 pods per node \[Benchmark\]' - 'resource tracking for 0 pods per node \[Benchmark\]'
gci-resource2: gci-resource2:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'resource tracking for 35 pods per node \[Benchmark\]' - 'resource tracking for 35 pods per node \[Benchmark\]'
gci-resource3: gci-resource3:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'resource tracking for 105 pods per node \[Benchmark\]' - 'resource tracking for 105 pods per node \[Benchmark\]'
coreos-resource1: coreos-resource1:

16
test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
View File

@ -4,55 +4,55 @@ images:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'create 35 pods with 0s? interval \[Benchmark\]' - 'create 35 pods with 0s? interval \[Benchmark\]'
gci-density2: gci-density2:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'create 105 pods with 0s? interval \[Benchmark\]' - 'create 105 pods with 0s? interval \[Benchmark\]'
gci-density2-qps60: gci-density2-qps60:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]' - 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
gci-density3: gci-density3:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-2 machine: n1-standard-2
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'create 105 pods with 0s? interval \[Benchmark\]' - 'create 105 pods with 0s? interval \[Benchmark\]'
gci-density4: gci-density4:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'create 105 pods with 100ms interval \[Benchmark\]' - 'create 105 pods with 100ms interval \[Benchmark\]'
gci-resource1: gci-resource1:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'resource tracking for 0 pods per node \[Benchmark\]' - 'resource tracking for 0 pods per node \[Benchmark\]'
gci-resource2: gci-resource2:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'resource tracking for 35 pods per node \[Benchmark\]' - 'resource tracking for 35 pods per node \[Benchmark\]'
gci-resource3: gci-resource3:
image: gci-dev-56-8977-0-0 image: gci-dev-56-8977-0-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'resource tracking for 105 pods per node \[Benchmark\]' - 'resource tracking for 105 pods per node \[Benchmark\]'

2
test/e2e_node/jenkins/cri_validation/image-config.yaml
View File

@ -5,4 +5,4 @@ images:
gci-family: gci-family:
image_regex: gci-dev-56-8977-0-0 image_regex: gci-dev-56-8977-0-0
project: google-containers project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"

2
test/e2e_node/jenkins/docker_validation/jenkins-perf.properties
View File

@ -11,7 +11,7 @@ CONFIG_FILE=test/e2e_node/jenkins/docker_validation/perf-config.yaml
cp $CONFIG_FILE $GCE_IMAGE_CONFIG_PATH cp $CONFIG_FILE $GCE_IMAGE_CONFIG_PATH
sed -i -e "s@{{IMAGE}}@${GCI_IMAGE}@g" $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@{{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 sed -i -e "s@{{METADATA}}@user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION},gci-update-strategy=update_disabled@g" $GCE_IMAGE_CONFIG_PATH
GCE_HOSTS= GCE_HOSTS=
GCE_ZONE=us-central1-f GCE_ZONE=us-central1-f

2
test/e2e_node/jenkins/docker_validation/jenkins-validation.properties
View File

@ -11,7 +11,7 @@ GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-ci-node-e2e GCE_PROJECT=k8s-jkns-ci-node-e2e
# 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}" GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION},gci-update-strategy=update_disabled"
CLEANUP=true CLEANUP=true
GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"' GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
TIMEOUT=1h TIMEOUT=1h

2
test/e2e_node/jenkins/image-config.yaml
View File

@ -15,4 +15,4 @@ images:
gci-family: gci-family:
image_regex: gci-dev-56-8977-0-0 image_regex: gci-dev-56-8977-0-0
project: google-containers project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"