Merge pull request #1357 from timstclair/jenkins

Update jenkins script to match job configs
This commit is contained in:
Tim St. Clair 2016-06-30 13:33:08 -07:00 committed by GitHub
commit 5a28a0c718

View File

@ -17,36 +17,37 @@
set -e set -e
set -x set -x
godep go build github.com/google/cadvisor/integration/runner BUILDER=${BUILDER:-false} # Whether this is running a PR builder job.
# Host Notes go get -u github.com/tools/godep
# e2e-cadvisor-ubuntu-trusty-docker110 ./build/presubmit.sh
# - ubuntu 14.04 godep go build -tags test github.com/google/cadvisor/integration/runner
# - docker 1.10
# e2e-cadvisor-container-vm-v20160127-docker18
# - docker 1.8.3
# e2e-cadvisor-container-vm-v20151215-docker18
# - docker 1.8.3
# e2e-cadvisor-ubuntu-trusty-docker19
# - ubunty 14.04
# - docker 1.9.1
# e2e-cadvisor-coreos-beta-docker19
# - docker 1.9.1
# e2e-cadvisor-rhel-7-docker19
# - red hat 7
# - docker 1.9.1
# e2e-cadvisor-centos-v7
# - docker 1.9.1
# Nodes that are currently stable. When tests fail on a specific node, and the failure is not remedied within a week, that node will be removed from this list. # Nodes that are currently stable. When tests fail on a specific node, and the failure is not remedied within a week, that node will be removed from this list.
golden_nodes="e2e-cadvisor-ubuntu-trusty-docker19 e2e-cadvisor-coreos-beta-docker19 e2e-cadvisor-container-vm-v20151215-docker18 e2e-cadvisor-container-vm-v20160127-docker18 e2e-cadvisor-rhel-7-docker19 golden_nodes=(
" e2e-cadvisor-ubuntu-trusty
e2e-cadvisor-container-vm-v20151215
e2e-cadvisor-container-vm-v20160127
e2e-cadvisor-rhel-7
)
# TODO: Add test on GCI
# TODO: Add test for kubernetes default image
# e2e-cadvisor-container-vm-v20160321
# TODO: Temporarily disabled for #1344
# e2e-cadvisor-coreos-beta
# TODO: enable when docker 1.10 is working # TODO: enable when docker 1.10 is working
# e2e-cadvisor-ubuntu-trusty-docker110 # e2e-cadvisor-ubuntu-trusty-docker110
# Always fails with "Network tx and rx bytes should not be equal" # TODO: Always fails with "Network tx and rx bytes should not be equal"
failing_nodes="e2e-cadvisor-centos-v7" # e2e-cadvisor-centos-v7
max_retries=8 max_retries=8
./runner --logtostderr --test-retry-count=$max_retries --test-retry-whitelist=integration/runner/retrywhitelist.txt $golden_nodes ./runner --logtostderr --test-retry-count=$max_retries \
--test-retry-whitelist=integration/runner/retrywhitelist.txt \
--ssh-options "-i /var/lib/jenkins/gce_keys/google_compute_engine -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o CheckHostIP=no -o StrictHostKeyChecking=no" \
${golden_nodes[*]}