Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

some cleanups in e2e #1974

Merged
merged 2 commits into from
Mar 18, 2020
Merged

some cleanups in e2e #1974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4528b63
skip master node in image loading
cofyc Mar 18, 2020
4196c02
Merge branch 'master' into cleanup-e2e
sre-bot Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions hack/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,17 @@ function hack::wait_for_success() {
return 1
}

#
# Concatenates the elements with an separator between them.
#
# Usage: hack::join ',' a b c
#
function hack::join() {
local IFS="$1"
shift
echo "$*"
}

function hack::__verify_kubetest2() {
local n="$1"
local v="$2"
Expand Down
3 changes: 2 additions & 1 deletion hack/run-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,10 @@ function e2e::image_load() {
$E2E_IMAGE
)
if [ "$PROVIDER" == "kind" ]; then
local nodes=$($KIND_BIN get nodes --name $CLUSTER | grep -v 'control-plane$')
echo "info: load images ${images[@]}"
for n in ${images[@]}; do
$KIND_BIN load docker-image --name $CLUSTER $n
$KIND_BIN load docker-image --name $CLUSTER $n --nodes $(hack::join ',' ${nodes[@]})
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a time-consuming process, we can skip master node to speed it up a little

done
elif [ "$PROVIDER" == "gke" ]; then
unset DOCKER_CONFIG # We don't need this and it may be read-only and fail the command to fail
Expand Down
3 changes: 0 additions & 3 deletions tests/images/test-apiserver/Dockerfile
View file
Open in desktop

This file was deleted.