Skip to content

If the CF-Application is already created, the Staging Information will now be updated instead of ignored #14

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

Open
sijakubo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

If the CF-Application is already created, the Staging Information will now be updated instead of ignored #14

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36bc585
added update of the application.Staging information if the app is alr…
Mar 22, 2017
700df55
added update of the application.Staging information if the app is alr…
Mar 22, 2017
624ec17
Merge remote-tracking branch 'origin/master'
Mar 22, 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
7 changes: 5 additions & 2 deletions src/main/java/com/hpe/cloudfoundryjenkins/CloudFoundryPushPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,22 +368,25 @@ private boolean createApplicationIfNeeded(CloudFoundryClient client, BuildListen
}
}

Staging staging = new Staging(deploymentInfo.getCommand(), deploymentInfo.getBuildpack(),
deploymentInfo.getStack(), deploymentInfo.getTimeout());

// Create app if it doesn't exist
if (createNewApp) {
listener.getLogger().println("Creating new app.");
String stack = deploymentInfo.getStack();
if (stack != null && client.getStack(stack) == null) {
throw new IllegalArgumentException("Stack " + stack + " does not exist on the target.");
}
Staging staging = new Staging(deploymentInfo.getCommand(), deploymentInfo.getBuildpack(),
deploymentInfo.getStack(), deploymentInfo.getTimeout());
List<String> uris = new ArrayList<String>();
// Pass an empty List as the uri list if no-route is set
if (!deploymentInfo.isNoRoute()) {
uris.add(appURI);
}
List<String> services = deploymentInfo.getServicesNames();
client.createApplication(deploymentInfo.getAppName(), staging, deploymentInfo.getMemory(), uris, services);
} else {
client.updateApplicationStaging(deploymentInfo.getAppName(), staging);
}

return createNewApp;
Expand Down