Skip to content

Add support for Job DSL with and without localConfig key inside browseStackBuildWrapper #36

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
francisf merged 4 commits into from
Feb 22, 2021
Merged

Add support for Job DSL with and without localConfig key inside browseStackBuildWrapper #36

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
a142e42
added support for env variable https_proxy set (facing issues with en…
Dec 11, 2020
a016553
fix: making localConfig optional by providing @DataBoundSetter functi…
Feb 17, 2021
4877fec
Merge branch 'master' of github.com:jenkinsci/browserstack-integratio…
Feb 17, 2021
c9a198b
minor version change in pom.xml
Feb 22, 2021
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: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>

<artifactId>browserstack-integration</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.2-SNAPSHOT</version>
<packaging>hpi</packaging>

<name>BrowserStack</name>
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackBuildWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import hudson.util.DescribableList;
import org.apache.commons.lang.StringUtils;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;

import java.io.IOException;
import java.io.PrintStream;
Expand All @@ -31,15 +32,19 @@ public class BrowserStackBuildWrapper extends BuildWrapper {

private static final char CHAR_MASK = '*';

private final LocalConfig localConfig;
private LocalConfig localConfig;

private String credentialsId;
private String username;
private String accesskey;

@DataBoundConstructor
public BrowserStackBuildWrapper(String credentialsId, LocalConfig localConfig) {
public BrowserStackBuildWrapper(String credentialsId) {
this.credentialsId = credentialsId;
}

@DataBoundSetter
public void setLocalConfig(LocalConfig localConfig) {
this.localConfig = localConfig;
}

Expand Down
3 changes: 2 additions & 1 deletion src/test/java/com/browserstack/automate/ci/jenkins/AutomateTestActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ public void addBuildStep() throws IOException {
localConfig.setLocalOptions("-force");

BrowserStackBuildWrapper buildWrapper =
new BrowserStackBuildWrapper(credentialsId, localConfig);
new BrowserStackBuildWrapper(credentialsId);
buildWrapper.setLocalConfig(localConfig);
project.getBuildWrappersList().add(buildWrapper);
}

Expand Down
3 changes: 2 additions & 1 deletion src/test/java/com/browserstack/automate/ci/jenkins/AutomateTestDataPublisherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ public void addBuildStep() throws IOException {
LocalConfig localConfig = new LocalConfig();
localConfig.setLocalOptions("-force");

BrowserStackBuildWrapper buildWrapper = new BrowserStackBuildWrapper(credentialsId, localConfig);
BrowserStackBuildWrapper buildWrapper = new BrowserStackBuildWrapper(credentialsId);
buildWrapper.setLocalConfig(localConfig);
project.getBuildWrappersList().add(buildWrapper);
}

Expand Down