github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21430 from spxtr/e2e-internal

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-21 12:08:22 -08:00
parent 99c1df19b1 2b756ca56d
commit 1ce188e557
9 changed files with 25 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/aws/util.sh
View File

@@ -1446,11 +1446,13 @@ function test-build-release {
}
# Execute prior to running tests to initialize required structure. This is
# called from hack/e2e.go only when running -up (it is run after kube-up).
# called from hack/e2e.go only when running -up.
#
# Assumed vars:
# Variables from config.sh
function test-setup {
"${KUBE_ROOT}/cluster/kube-up.sh"
VPC_ID=$(get_vpc_id)
detect-security-groups