Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
7c506c6a
Commit
7c506c6a
authored
Aug 07, 2017
by
Maciej Borsz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modify e2e.go to arbitrarily pick one of zones we have nodes in for
multizone tests.
parent
8b30aaec
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
e2e.go
test/e2e/e2e.go
+13
-1
test_context.go
test/e2e/framework/test_context.go
+1
-1
No files found.
test/e2e/e2e.go
View file @
7c506c6a
...
...
@@ -77,7 +77,8 @@ func setupProviderConfig() error {
if
!
framework
.
TestContext
.
CloudConfig
.
MultiZone
{
managedZones
=
[]
string
{
zone
}
}
cloudConfig
.
Provider
,
err
=
gcecloud
.
CreateGCECloud
(
framework
.
TestContext
.
CloudConfig
.
ApiEndpoint
,
gceCloud
,
err
:=
gcecloud
.
CreateGCECloud
(
framework
.
TestContext
.
CloudConfig
.
ApiEndpoint
,
framework
.
TestContext
.
CloudConfig
.
ProjectID
,
region
,
zone
,
managedZones
,
""
/* networkUrl */
,
""
/* subnetworkUrl */
,
nil
,
/* nodeTags */
""
/* nodeInstancePerfix */
,
nil
/* tokenSource */
,
false
/* useMetadataServer */
)
...
...
@@ -85,6 +86,17 @@ func setupProviderConfig() error {
return
fmt
.
Errorf
(
"Error building GCE/GKE provider: %v"
,
err
)
}
cloudConfig
.
Provider
=
gceCloud
if
cloudConfig
.
Zone
==
""
&&
framework
.
TestContext
.
CloudConfig
.
MultiZone
{
zones
,
err
:=
gceCloud
.
GetAllZones
()
if
err
!=
nil
{
return
err
}
cloudConfig
.
Zone
,
_
=
zones
.
PopAny
()
}
case
"aws"
:
if
cloudConfig
.
Zone
==
""
{
return
fmt
.
Errorf
(
"gce-zone must be specified for AWS"
)
...
...
test/e2e/framework/test_context.go
View file @
7c506c6a
...
...
@@ -144,7 +144,7 @@ type NodeTestContextType struct {
type
CloudConfig
struct
{
ApiEndpoint
string
ProjectID
string
Zone
string
Zone
string
// for multizone tests, arbitrarily chosen zone
Region
string
MultiZone
bool
Cluster
string
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment