Skip to content

Merging AWSLabs changes back to Jenkins copy. #16

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

Merged
merged 4 commits into from
Dec 18, 2017
Merged

Merging AWSLabs changes back to Jenkins copy. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1312c91
sync from repo https://github.com/jenkinsci/aws-codedeploy-plugin.git…
May 13, 2017
de6b82c
Update plugin to allow concurrent build executions.
Jmcfar Dec 18, 2017
7f85b36
Removing sample application files that should not be present in plugin.
Jmcfar Dec 18, 2017
9d31b34
Merge branch 'master' into master
Jmcfar Dec 18, 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
2 changes: 2 additions & 0 deletions src/main/java/com/amazonaws/codedeploy/AWSClients.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ public static AWSClients fromBasicCredentials(String region, String awsAccessKey
/**
* Via the default provider chain (i.e., global keys for this Jenkins instance), return the account ID for the
* currently authenticated user.
* @param proxyHost hostname of the proxy to use (if any)
* @param proxyPort port of the proxy to use (if any)
* @return 12-digit account id
*/
public static String getAccountId(String proxyHost, int proxyPort) {
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
/**
* The AWS CodeDeploy Publisher is a post-build plugin that adds the ability to start a new CodeDeploy deployment
* with the project's workspace as the application revision.
* <p/>
*
* To configure, users must create an IAM role that allows "S3" and "CodeDeploy" actions and must be assumable by
* the globally configured keys. This allows the plugin to get temporary credentials instead of requiring permanent
* credentials to be configured for each project.
Expand Down Expand Up @@ -488,15 +488,13 @@ public DescriptorImpl getDescriptor() {
}

public BuildStepMonitor getRequiredMonitorService() {

return BuildStepMonitor.STEP;
return BuildStepMonitor.NONE;
}

/**
* Descriptor for {@link AWSCodeDeployPublisher}. Used as a singleton.
* The class is marked as public so that it can be accessed from views.
* <p/>
* <p/>
*
* See <tt>src/main/resources/com/amazonaws/codedeploy/AWSCodeDeployPublisher/*.jelly</tt>
* for the actual HTML fragment for the configuration screen.
*/
Expand Down