Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1977 from jglick/refactor-test-harness
[JENKINS-32478] Split of test harness into separate artifact
- Loading branch information
Showing
174 changed files
with
596 additions
and
1,099 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| The MIT License | ||
| Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.jenkins-ci.main</groupId> | ||
| <artifactId>pom</artifactId> | ||
| <version>1.645-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>jenkins-test-harness-tools</artifactId> | ||
|
|
||
| <name>Test harness tools</name> | ||
| <description>Tool installations that may be used by functional tests.</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>jenkins-test-harness</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jenkins-ci.plugins</groupId> | ||
| <artifactId>ant</artifactId> | ||
| <version>1.2</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| </project> |
135 changes: 135 additions & 0 deletions
135
test-harness-tools/src/main/java/org/jvnet/hudson/test/ToolInstallations.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2016 CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package org.jvnet.hudson.test; | ||
|
|
||
| import hudson.FilePath; | ||
| import hudson.Functions; | ||
| import hudson.Launcher; | ||
| import hudson.tasks.Ant; | ||
| import hudson.tasks.Maven; | ||
| import hudson.util.StreamTaskListener; | ||
| import hudson.util.jna.GNUCLibrary; | ||
| import java.io.File; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
| import jenkins.model.Jenkins; | ||
| import org.junit.rules.TemporaryFolder; | ||
|
|
||
| /** | ||
| * Utility to install standard tools in the Jenkins under test. | ||
| */ | ||
| public class ToolInstallations { | ||
|
|
||
| private static final Logger LOGGER = Logger.getLogger(ToolInstallations.class.getName()); | ||
|
|
||
| /** | ||
| * Returns the older default Maven, while still allowing specification of | ||
| * other bundled Mavens. | ||
| */ | ||
| public static Maven.MavenInstallation configureDefaultMaven() throws Exception { | ||
| return configureDefaultMaven("apache-maven-2.2.1", Maven.MavenInstallation.MAVEN_20); | ||
| } | ||
|
|
||
| public static Maven.MavenInstallation configureMaven3() throws Exception { | ||
| Maven.MavenInstallation mvn = configureDefaultMaven("apache-maven-3.0.1", Maven.MavenInstallation.MAVEN_30); | ||
|
|
||
| Maven.MavenInstallation m3 = new Maven.MavenInstallation("apache-maven-3.0.1", mvn.getHome(), JenkinsRule.NO_PROPERTIES); | ||
| Jenkins.getInstance().getDescriptorByType(Maven.DescriptorImpl.class).setInstallations(m3); | ||
| return m3; | ||
| } | ||
|
|
||
| /** | ||
| * Locates Maven2 and configure that as the only Maven in the system. | ||
| */ | ||
| public static Maven.MavenInstallation configureDefaultMaven(String mavenVersion, int mavenReqVersion) throws Exception { | ||
| // first if we are running inside Maven, pick that Maven, if it meets the criteria we require.. | ||
| File buildDirectory = new File(System.getProperty("buildDirectory", "target")); // TODO relative path | ||
| File mvnHome = new File(buildDirectory, mavenVersion); | ||
| if (mvnHome.exists()) { | ||
| Maven.MavenInstallation mavenInstallation = new Maven.MavenInstallation("default", mvnHome.getAbsolutePath(), JenkinsRule.NO_PROPERTIES); | ||
| Jenkins.getInstance().getDescriptorByType(Maven.DescriptorImpl.class).setInstallations(mavenInstallation); | ||
| return mavenInstallation; | ||
| } | ||
|
|
||
| // Does maven.home point to a Maven installation which satisfies mavenReqVersion? | ||
| String home = System.getProperty("maven.home"); | ||
| if (home != null) { | ||
| Maven.MavenInstallation mavenInstallation = new Maven.MavenInstallation("default", home, JenkinsRule.NO_PROPERTIES); | ||
| if (mavenInstallation.meetsMavenReqVersion(new Launcher.LocalLauncher(StreamTaskListener.fromStdout()), mavenReqVersion)) { | ||
| Jenkins.getInstance().getDescriptorByType(Maven.DescriptorImpl.class).setInstallations(mavenInstallation); | ||
| return mavenInstallation; | ||
| } | ||
| } | ||
|
|
||
| // otherwise extract the copy we have. | ||
| // this happens when a test is invoked from an IDE, for example. | ||
| LOGGER.log(Level.WARNING,"Extracting a copy of Maven bundled in the test harness into {0}. " | ||
| + "To avoid a performance hit, set the system property ''maven.home'' to point to a Maven2 installation.", mvnHome); | ||
| FilePath mvn = Jenkins.getInstance().getRootPath().createTempFile("maven", "zip"); | ||
| mvn.copyFrom(JenkinsRule.class.getClassLoader().getResource(mavenVersion + "-bin.zip")); | ||
| mvn.unzip(new FilePath(buildDirectory)); | ||
| // TODO: switch to tar that preserves file permissions more easily | ||
| try { | ||
| GNUCLibrary.LIBC.chmod(new File(mvnHome, "bin/mvn").getPath(), 0755); | ||
| } catch (LinkageError x) { | ||
| // skip; TODO 1.630+ can use Functions.isGlibcSupported | ||
| } | ||
|
|
||
| Maven.MavenInstallation mavenInstallation = new Maven.MavenInstallation("default", | ||
| mvnHome.getAbsolutePath(), JenkinsRule.NO_PROPERTIES); | ||
| Jenkins.getInstance().getDescriptorByType(Maven.DescriptorImpl.class).setInstallations(mavenInstallation); | ||
| return mavenInstallation; | ||
| } | ||
|
|
||
| /** | ||
| * Extracts Ant and configures it. | ||
| */ | ||
| public static Ant.AntInstallation configureDefaultAnt(TemporaryFolder tmp) throws Exception { | ||
| Ant.AntInstallation antInstallation; | ||
| if (System.getenv("ANT_HOME") != null) { | ||
| antInstallation = new Ant.AntInstallation("default", System.getenv("ANT_HOME"), JenkinsRule.NO_PROPERTIES); | ||
| } else { | ||
| LOGGER.warning("Extracting a copy of Ant bundled in the test harness. " | ||
| + "To avoid a performance hit, set the environment variable ANT_HOME to point to an Ant installation."); | ||
| FilePath ant = Jenkins.getInstance().getRootPath().createTempFile("ant", "zip"); | ||
| ant.copyFrom(JenkinsRule.class.getClassLoader().getResource("apache-ant-1.8.1-bin.zip")); | ||
| File antHome = tmp.newFolder("antHome"); | ||
| ant.unzip(new FilePath(antHome)); | ||
| // TODO: switch to tar that preserves file permissions more easily | ||
| try { | ||
| GNUCLibrary.LIBC.chmod(new File(antHome, "apache-ant-1.8.1/bin/ant").getPath(), 0755); | ||
| } catch (LinkageError x) { | ||
| // skip; TODO 1.630+ can use Functions.isGlibcSupported | ||
| } | ||
|
|
||
| antInstallation = new Ant.AntInstallation("default", new File(antHome, "apache-ant-1.8.1").getAbsolutePath(), JenkinsRule.NO_PROPERTIES); | ||
| } | ||
| Jenkins.getInstance().getDescriptorByType(Ant.DescriptorImpl.class).setInstallations(antInstallation); | ||
| return antInstallation; | ||
| } | ||
|
|
||
| private ToolInstallations() { | ||
| } | ||
|
|
||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| The MIT License | ||
| Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.jenkins-ci.main</groupId> | ||
| <artifactId>pom</artifactId> | ||
| <version>1.645-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>jenkins-test-harness</artifactId> | ||
|
|
||
| <name>Test harness for Jenkins and plugins</name> | ||
| <description>Harness used to run functional tests of Jenkins core and plugins.</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <!-- | ||
| put hudson.war in the classpath. we can't pull in the war artifact directly | ||
| because Maven excludes all wars from classpath automatically. so we need a jar artifact. | ||
| --> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>jenkins-war</artifactId> | ||
| <version>1.580.1</version> | ||
| <classifier>war-for-test</classifier> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.jenkins-ci.modules</groupId> | ||
| <artifactId>sshd</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.mortbay.jetty</groupId> | ||
| <artifactId>jetty</artifactId> | ||
| <version>6.1.26</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.hamcrest</groupId> | ||
| <artifactId>hamcrest-library</artifactId> | ||
| <version>1.3</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>net.sourceforge.htmlunit</groupId> | ||
| <artifactId>htmlunit</artifactId> | ||
| <version>2.18</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>commons-codec</groupId> | ||
| <artifactId>commons-codec</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jvnet.hudson</groupId> | ||
| <artifactId>embedded-rhino-debugger</artifactId> | ||
| <version>1.2</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.jvnet.hudson</groupId> | ||
| <artifactId>htmlunit-core-js</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.netbeans.modules</groupId> | ||
| <artifactId>org-netbeans-insane</artifactId> | ||
| <version>RELEASE72</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.stephenc.findbugs</groupId> | ||
| <artifactId>findbugs-annotations</artifactId> | ||
| <version>1.3.9-1</version> | ||
| </dependency> | ||
| <dependency> <!-- TODO can we switch this to use Aether directly? --> | ||
| <groupId>org.jenkins-ci.lib</groupId> | ||
| <artifactId>lib-jenkins-maven-embedder</artifactId> | ||
| <version>3.11</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.sonatype.sisu</groupId> | ||
| <artifactId>sisu-guice</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jenkins-ci.plugins</groupId> | ||
| <artifactId>matrix-auth</artifactId> | ||
| <version>1.0.2</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.kohsuke.stapler</groupId> | ||
| <artifactId>maven-stapler-plugin</artifactId> | ||
| <!-- version specified in grandparent pom --> | ||
| <extensions>true</extensions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <!-- version specified in grandparent pom --> | ||
| <configuration> | ||
| <argLine>-Dfile.encoding=UTF-8 -Xmx256m -XX:MaxPermSize=128m</argLine> | ||
| <systemPropertyVariables> | ||
| <!-- use AntClassLoader that supports predictable file handle release --> | ||
| <hudson.ClassicPluginStrategy.useAntClassLoader>true</hudson.ClassicPluginStrategy.useAntClassLoader> | ||
| <hudson.maven.debug>${mavenDebug}</hudson.maven.debug> | ||
| <buildDirectory>${project.build.directory}</buildDirectory> | ||
| <ignore.random.failures>${ignore.random.failures}</ignore.random.failures> | ||
| </systemPropertyVariables> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.gmaven</groupId> | ||
| <artifactId>gmaven-plugin</artifactId> | ||
| <!-- version specified in grandparent pom --> | ||
| <executions> | ||
| <execution> | ||
| <id>preset-packager</id> | ||
| <phase>process-resources</phase> | ||
| <goals> | ||
| <goal>execute</goal> | ||
| </goals> | ||
| <configuration> | ||
| <source>${pom.basedir}/src/main/preset-data/package.groovy</source> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.ant</groupId> | ||
| <artifactId>ant</artifactId> | ||
| <version>1.8.0</version> | ||
| </dependency> | ||
| <!-- Usually a dependency of ant, but some people seem to have an incomplete ant POM. See JENKINS-11416 --> | ||
| <dependency> | ||
| <groupId>org.apache.ant</groupId> | ||
| <artifactId>ant-launcher</artifactId> | ||
| <version>1.8.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.codehaus.gmaven.runtime</groupId> | ||
| <artifactId>gmaven-runtime-2.0</artifactId> | ||
| <version>1.5-jenkins-1</version> | ||
| </dependency> | ||
| </dependencies> | ||
| <configuration> | ||
| <providerSelection>2.0</providerSelection> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.