diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..7cd8a9e --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,12 @@ +/* +See the documentation for more options: +https://github.com/jenkins-infra/pipeline-library/ +*/ +buildPlugin( + forkCount: '1C', // Run a JVM per core in tests + useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests + configurations: [ + [platform: 'linux', jdk: 11], + [platform: 'windows', jdk: 8] + ] +) \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3cb2beb..fb41d47 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,18 @@ org.jenkins-ci.plugins plugin - 4.16 + 4.51 + - 2.338 - 8 + + 2.346 + ${jenkins.baseline}.3 buildwrapper true - scm:git:git://github.com/jenkinsci/testingbot-plugin.git + scm:git:https://github.com/jenkinsci/testingbot-plugin.git scm:git:git@github.com:jenkinsci/testingbot-plugin.git testingbot-1.20-SNAPSHOT @@ -67,8 +69,8 @@ io.jenkins.tools.bom - bom-2.235.x - 25 + bom-${jenkins.baseline}.x + 1763.v092b_8980a_f5e import pom diff --git a/src/main/java/testingbot/TestingBotBuilder.java b/src/main/java/testingbot/TestingBotBuilder.java index 284c2a5..f692e27 100644 --- a/src/main/java/testingbot/TestingBotBuilder.java +++ b/src/main/java/testingbot/TestingBotBuilder.java @@ -9,12 +9,12 @@ import hudson.tasks.Builder; import hudson.tasks.BuildStepDescriptor; import hudson.util.ListBoxModel; -import java.io.*; +import java.io.File; +import java.io.IOException; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; -import java.nio.file.Paths; import com.cloudbees.plugins.credentials.CredentialsMatchers; import com.cloudbees.plugins.credentials.CredentialsProvider; import com.cloudbees.plugins.credentials.common.StandardListBoxModel; diff --git a/src/main/java/testingbot/TestingBotCredentials.java b/src/main/java/testingbot/TestingBotCredentials.java index e9301a3..49d1c68 100644 --- a/src/main/java/testingbot/TestingBotCredentials.java +++ b/src/main/java/testingbot/TestingBotCredentials.java @@ -20,7 +20,6 @@ import com.cloudbees.plugins.credentials.common.IdCredentials; import com.cloudbees.plugins.credentials.common.StandardCredentials; import com.cloudbees.plugins.credentials.domains.Domain; -import com.cloudbees.plugins.credentials.domains.DomainRequirement; import com.cloudbees.plugins.credentials.impl.BaseStandardCredentials; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/testingbot/TestingBotReport.java b/src/main/java/testingbot/TestingBotReport.java index 3828bfb..fb1d2e0 100644 --- a/src/main/java/testingbot/TestingBotReport.java +++ b/src/main/java/testingbot/TestingBotReport.java @@ -6,12 +6,10 @@ */ import com.testingbot.testingbotrest.TestingbotREST; import hudson.model.AbstractBuild; -import hudson.model.Run; import hudson.tasks.junit.CaseResult; import hudson.tasks.junit.TestAction; import java.util.Collections; import java.util.List; -import testingbot.TestingBotBuildWrapper.BuildWrapperItem; /** * Show videos for the tests. diff --git a/src/main/java/testingbot/TestingBotTestEmbed.java b/src/main/java/testingbot/TestingBotTestEmbed.java index 10dc935..af6be63 100644 --- a/src/main/java/testingbot/TestingBotTestEmbed.java +++ b/src/main/java/testingbot/TestingBotTestEmbed.java @@ -2,14 +2,12 @@ import hudson.model.Run; import jenkins.model.RunAction2; -import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import javax.servlet.ServletException; import java.io.IOException; import java.util.List; -import java.util.logging.Level; import java.util.logging.Logger; public class TestingBotTestEmbed implements RunAction2 { diff --git a/src/main/java/testingbot/pipeline/TestingBotStep.java b/src/main/java/testingbot/pipeline/TestingBotStep.java index d0656ed..1074769 100644 --- a/src/main/java/testingbot/pipeline/TestingBotStep.java +++ b/src/main/java/testingbot/pipeline/TestingBotStep.java @@ -15,7 +15,6 @@ import com.cloudbees.plugins.credentials.CredentialsProvider; import com.cloudbees.plugins.credentials.common.StandardListBoxModel; -import com.cloudbees.plugins.credentials.common.StandardUsernameListBoxModel; import com.cloudbees.plugins.credentials.domains.DomainRequirement; import com.google.inject.Inject; import hudson.Extension; diff --git a/src/main/java/testingbot/pipeline/TestingBotTestPublisher.java b/src/main/java/testingbot/pipeline/TestingBotTestPublisher.java index 6eb08a4..22ddded 100644 --- a/src/main/java/testingbot/pipeline/TestingBotTestPublisher.java +++ b/src/main/java/testingbot/pipeline/TestingBotTestPublisher.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import testingbot.TestReporter; public class TestingBotTestPublisher extends Recorder implements SimpleBuildStep { diff --git a/src/main/java/testingbot/pipeline/TestingBotTunnelStep.java b/src/main/java/testingbot/pipeline/TestingBotTunnelStep.java index 4faec3c..f303ad8 100644 --- a/src/main/java/testingbot/pipeline/TestingBotTunnelStep.java +++ b/src/main/java/testingbot/pipeline/TestingBotTunnelStep.java @@ -1,16 +1,13 @@ package testingbot.pipeline; -import com.cloudbees.plugins.credentials.CredentialsMatchers; import com.cloudbees.plugins.credentials.CredentialsProvider; import com.cloudbees.plugins.credentials.common.StandardListBoxModel; -import com.cloudbees.plugins.credentials.common.StandardUsernameListBoxModel; import com.cloudbees.plugins.credentials.domains.DomainRequirement; import com.google.inject.Inject; import com.testingbot.tunnel.Api; import com.testingbot.tunnel.App; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; -import hudson.Util; import hudson.model.Computer; import hudson.model.Item; import hudson.model.Job; diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly new file mode 100644 index 0000000..307e766 --- /dev/null +++ b/src/main/resources/index.jelly @@ -0,0 +1,4 @@ + +
+ This plugin integrates videos/screenshots of your TestingBot.com Selenium tests +