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

feat(moniker): Attempt to use moniker before frigga in appengine packages #1697

Merged
merged 3 commits into from
Oct 25, 2017
Merged

feat(moniker): Attempt to use moniker before frigga in appengine packages #1697

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89c29ce
Attempt to use moniker before frigga
andrewbackes Oct 13, 2017
6658713
Merge branch 'master' into appengine-moniker
lwander Oct 16, 2017
fb255c3
Merge branch 'master' into appengine-moniker
lwander Oct 25, 2017
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
4 changes: 3 additions & 1 deletion ...ddriver/tasks/providers/appengine/AbstractWaitForAppEngineServerGroupStopStartTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ abstract class AbstractWaitForAppEngineServerGroupStopStartTask extends Abstract
String account = getCredentials(stage)
String serverGroupName = (stage.context.serverGroupName ?: stage.context.asgName) as String
Names names = Names.parseName(serverGroupName)
String appName = stage.context.moniker?.app ?: names.app
String clusterName = stage.context.moniker?.cluster ?: names.cluster
try {
def response = oortService.getCluster(names.app, account, names.cluster, cloudProvider)
def response = oortService.getCluster(appName, account, clusterName, cloudProvider)
Map cluster = objectMapper.readValue(response.body.in().text, Map)

def serverGroup = cluster.serverGroups.find { it.name == serverGroupName }
Expand Down