Skip to content

Commit

Permalink
Merge pull request #185 from UiPath/develop
Browse files Browse the repository at this point in the history 
Merge to jenkinsci repo from forked repo for v4 release [AUOPS-4287]
  • Loading branch information
@cotovanu-cristian
cotovanu-cristian authored Oct 17, 2024
2 parents 97789f0 + 4695723 commit e49c2d6
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 8 deletions.
59 changes: 56 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@
<packaging>hpi</packaging>

<properties>
<jenkins.version>2.387.3</jenkins.version>
<jenkins.version>2.414.3</jenkins.version>
<powershell.version>1.7</powershell.version>
<envinject.version>2.4.0</envinject.version>
<mockito-core.version>4.8.0</mockito-core.version>
<plain-credentials.version>179.vc5cb_98f6db_38</plain-credentials.version>
<json.version>20231013</json.version>
<credentials.version>1319.v7eb_51b_3a_c97b_</credentials.version>
<org.jenkins-ci.plugins.junit.version>1265.v65b_14fa_f12f0</org.jenkins-ci.plugins.junit.version>
<org.jenkins-ci.plugins.junit.version>1304.vc85a_b_ca_96613</org.jenkins-ci.plugins.junit.version>
<JUnitParams.version>1.1.1</JUnitParams.version>
<matrix-project.version>1.20</matrix-project.version>
<native2ascii-maven-plugin.version>2.0.1</native2ascii-maven-plugin.version>
<properties-maven-plugin.version>1.1.0</properties-maven-plugin.version>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
Expand All @@ -35,6 +34,15 @@
<structs.version>325.vcb_307d2a_2782</structs.version>
<caffeine-api.version>3.1.8-133.v17b_1ff2e0599</caffeine-api.version>
<instance-identity.version>185.v303dc7c645f9</instance-identity.version>
<plugin-util-api.version>3.8.0</plugin-util-api.version>
<commons-text-api.version>1.10.0-78.v3e7b_ea_d5a_fe1</commons-text-api.version>
<workflow-support.version>865.v43e78cc44e0d</workflow-support.version>
<font-awesome-api.version>6.4.2-1</font-awesome-api.version>
<bootstrap5-api.version>5.3.2-3</bootstrap5-api.version>
<checks-api.version>2.0.2</checks-api.version>
<jquery3-api.version>3.7.1-1</jquery3-api.version>
<echarts-api.version>5.4.0-7</echarts-api.version>
<matrix-project.version>789.v57a_725b_63c79</matrix-project.version>
</properties>

<name>UiPath Plugin</name>
Expand Down Expand Up @@ -300,6 +308,51 @@
<artifactId>caffeine-api</artifactId>
<version>${caffeine-api.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>plugin-util-api</artifactId>
<version>${plugin-util-api.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>commons-text-api</artifactId>
<version>${commons-text-api.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>${workflow-support.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>font-awesome-api</artifactId>
<version>${font-awesome-api.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>bootstrap5-api</artifactId>
<version>${bootstrap5-api.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>checks-api</artifactId>
<version>${checks-api.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>jquery3-api</artifactId>
<version>${jquery3-api.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>echarts-api</artifactId>
<version>${echarts-api.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<version>${matrix-project.version}</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
Expand Down
15 changes: 10 additions & 5 deletions src/main/java/com/uipath/uipathpackage/UiPathTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class UiPathTest extends Recorder implements SimpleBuildStep, JUnitTask {
private final TraceLevel traceLevel;
private boolean attachRobotLogs;
private Boolean disableBuiltInNugetFeeds;

private static int TimeoutDefault = 7200;

/**
Expand Down Expand Up @@ -91,7 +91,7 @@ public UiPathTest(String orchestratorAddress, String orchestratorTenant, String
this.credentials = credentials;
this.timeout = timeout;
this.testResultsOutputPath = testResultsOutputPath;
this.parametersFilePath = parametersFilePath;
this.parametersFilePath = parametersFilePath;
this.disableBuiltInNugetFeeds = null;
this.repositoryUrl = null;
this.repositoryCommit = null;
Expand Down Expand Up @@ -181,7 +181,7 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace, @NonNul
testOptions.setTestReportType("junit");

String resultsOutputPath = testResultsOutputPath != null && !testResultsOutputPath.trim().isEmpty()
? testResultsOutputPath : "UiPathResults.xml";
? testResultsOutputPath : "UiPathResults.xml";

FilePath expandedTestResultsOutputPath = resultsOutputPath.contains("${WORKSPACE}") ?
new FilePath(launcher.getChannel(), envVars.expand(resultsOutputPath)) :
Expand All @@ -208,7 +208,7 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace, @NonNul

testOptions.setParametersFilePath(parametersPath.getRemote());
}

testOptions.setAttachRobotLogs(attachRobotLogs);

testOptions.setRepositoryUrl(repositoryUrl);
Expand Down Expand Up @@ -528,6 +528,11 @@ public boolean isKeepProperties() {
return false;
}

@Override
public boolean isKeepTestNames() {
return false;
}

@Override
public boolean isAllowEmptyResults() {
return true;
Expand Down Expand Up @@ -669,7 +674,7 @@ public FormValidation doCheckParametersFilePath(@QueryParameter String value) {

return FormValidation.ok();
}

/**
* Validates that the timeout is specified
*
Expand Down

0 comments on commit e49c2d6

Please sign in to comment.