Skip to content

Bug fix timeouts #4

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
kalsky wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Bug fix timeouts #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2afe4f6
use newer api package
kalsky Jul 29, 2019
456a44b
update messages
kalsky Jul 29, 2019
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
50 changes: 46 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
</parent>

<artifactId>cloudshell-sandbox</artifactId>
<version>1.7.5</version>
<version>1.7.8</version>
<packaging>hpi</packaging>

<properties>
<jenkins.version>2.9</jenkins.version>
<java.level>7</java.level>
<java.level>8</java.level>
<jenkins-test-harness.version>2.2</jenkins-test-harness.version>
</properties>

Expand Down Expand Up @@ -65,6 +65,17 @@
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>

<repository>
<id>oss.sonatype.org-snapshot</id>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
Expand All @@ -78,13 +89,30 @@
<dependency>
<groupId>com.quali.cloudshell</groupId>
<artifactId>sandbox-api</artifactId>
<version>1.2.0.2-SNAPSHOT</version>
<version>1.2.0.5-SNAPSHOT</version>
<!-- <scope>system</scope>-->
<!-- <systemPath>/Users/kalsky/github/quali/sandbox-api-maven/target/sandbox-api-1.2.0.5-SNAPSHOT.jar</systemPath>-->
</dependency>

<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.0</version>
</dependency>

<dependency>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java18</artifactId>
<version>1.0</version>
<type>signature</type>
</dependency>


<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>[4.3.6,)</version>
<version>4.3.6</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -148,4 +176,18 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>InjectedTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>

</project>
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/cloudshell/steps/SandboxStartStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public DescriptorImpl() {
return "startSandbox";
}

@Override public String getDisplayName() { return "starts a CloudShell Sandbox";
@Override public String getDisplayName() { return "Starts a CloudShell Sandbox";
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/cloudshell/steps/StepsCommon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void stopSandbox(TaskListener listener, String sandboxId, StepContext context, i
listener.getLogger().println("Teardown process cannot be verified, please use newer version of CloudShell to support this feature.");
}
} catch (TeardownFailedException e) {
listener.error("Teardown ended with erroes, see sandbox: " + sandboxId);
listener.error("Teardown ended with errors, see sandbox: " + sandboxId);
context.setResult(Result.FAILURE);
} catch (SandboxApiException | IOException | NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
listener.error("Failed to stop sandbox: " + e.getMessage() + ". \n" + Arrays.toString(e.getStackTrace()));
Expand Down