Merge pull request #58728 from dashpole/cadvisor_testing
Automatic merge from submit-queue (batch tested with PRs 57683, 59116, 58728, 59140, 58976). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Use node-e2e framework for testing cadvisor **What this PR does / why we need it**: With cadvisor checked out in your gopath, we can now run cadvisor integration tests: `make test-e2e-node TEST_SUITE=cadvisor`. This has a number of advantages: * we can use the same images to test both, configured the same way. * we will now get cadvisor logs from the integration test. * we can now use the familiar node-e2e arguments to specify images to test with cadvisor * no more managing snowflake VMs for cadvisor. **Special notes for your reviewer**: cadvisor doesnt currently produce junit* files, so I removed that as a requirement. This wont actually work until https://github.com/google/cadvisor/pull/1868 is merged as well. Related issue: https://github.com/kubernetes/test-infra/issues/190 **Release note**: ```release-note NONE ``` /assign @Random-Liu /sig node /priority important-soon /kind cleanup
This commit is contained in:
@@ -93,6 +93,7 @@ if [ $remote = true ] ; then
|
||||
instance_prefix=${INSTANCE_PREFIX:-"test"}
|
||||
cleanup=${CLEANUP:-"true"}
|
||||
delete_instances=${DELETE_INSTANCES:-"false"}
|
||||
test_suite=${TEST_SUITE:-"default"}
|
||||
|
||||
# Get the compute zone
|
||||
zone=$(gcloud info --format='value(config.properties.compute.zone)')
|
||||
@@ -147,6 +148,7 @@ if [ $remote = true ] ; then
|
||||
--image-project="$image_project" --instance-name-prefix="$instance_prefix" \
|
||||
--delete-instances="$delete_instances" --test_args="$test_args" --instance-metadata="$metadata" \
|
||||
--image-config-file="$image_config_file" --system-spec-name="$system_spec_name" \
|
||||
--test-suite="$test_suite" \
|
||||
2>&1 | tee -i "${artifacts}/build-log.txt"
|
||||
exit $?
|
||||
|
||||
|
Reference in New Issue
Block a user