diff --git a/src/main/resources/xsl/config.job.xsl b/src/main/resources/xsl/config.job.xsl index c3943bf..2c55cbe 100644 --- a/src/main/resources/xsl/config.job.xsl +++ b/src/main/resources/xsl/config.job.xsl @@ -38,6 +38,7 @@ + @@ -208,6 +209,13 @@ + + + + + + + diff --git a/src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java b/src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java index fdefc0e..9c7cdc1 100644 --- a/src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java +++ b/src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java @@ -327,6 +327,14 @@ public void configJobTest_andmore() { transformAndCompare("andmore", "config.job.hudson", "matrix-project"); } + /** + * Tests that combination filters are transformed correctly + */ + @Test + public void configJobTest_recommenders() { + transformAndCompare("recommenders", "config.job.hudson", "matrix-project"); + } + @Test public void copyViewsTest_positive() { testCopyViews("config.main.jenkins-cbi.xml", "config.main.hudson-cbi.xml"); diff --git a/xml/original/config.job.hudson-recommenders.xml b/xml/original/config.job.hudson-recommenders.xml new file mode 100644 index 0000000..e1bb529 --- /dev/null +++ b/xml/original/config.job.hudson-recommenders.xml @@ -0,0 +1,366 @@ + + + + <p>This job is responsible for populating the following update sites with maintenance versions of Code Recommenders: <a href="http://download.eclipse.org/recommenders/updates/maintenance-head/">maintenance-head</a>, <a href="http://download.eclipse.org/recommenders/updates/maintenance-milestones/">maintenance-milestones</a>, and <a href="http://download.eclipse.org/recommenders/updates/stable/">stable</a>.</p> + +<p>This job also deploys <em>release</em> and <em>snapshot</em> Maven artifacts to <a href="https://repo.eclipse.org/content/groups/recommenders/">repo.eclipse.org</a>.</p> + +<p>Moreover, this job <strong>may</strong> populate the update sites for both the current and the maintenance simultaneous release.</p> + + + hudson-plugins-checkstyle-CheckStylePublisher + + + + + low + [CHECKSTYLE] + + false + false + false + + + + + + + + + + + false + true + false + + + false + true + + + + hudson-plugins-disk_usage-DiskUsageProperty + + + false + + + + logRotator + + + -1 + 10 + 7 + -1 + + false + + + + hudson-plugins-promoted_builds-JobPropertyImpl + + + + milestones + current-simrel + maintenance-simrel + head + stable + + + false + + + + hudson-plugins-xvnc-Xvnc + + + false + + false + true + + + + axes + + + + simrel + + mars + neon + oxygen + photon + + + + toolchain + + JavaSE-1.7 + JavaSE-1.8 + + + + false + + + + hudson-tasks-Mailer + + + someone@somewhere.com + false + true + + false + true + + + + combinationFilter + + ((simrel == "mars") && toolchain == "JavaSE-1.7") || ((simrel == "neon" || simrel == "oxygen" || simrel == "photon") && toolchain == "JavaSE-1.8") + false + + + + hudson-tasks-junit-JUnitResultArchiver + + + **/target/surefire-reports/*.xml + false + + + false + true + + + + parametersDefinitionProperties + + + + + + CURRENT_SIMREL + The simultaneous release that is currently heading for its first release. (Until 2018-06-27, this will be <em>photon</em>.) + photon + + + CURRENT_TOOLCHAIN + The toolchain required for the current simultaneous release. + JavaSE-1.8 + + + MAINTENANCE_SIMREL + The simultaneous release that is currently in maintenance mode, i.e., which is supplied with service releases. (Until the final <em>photon</em> RC, this will be <em>oxygen</em>.) + oxygen + + + MAINTENANCE_TOOLCHAIN + The toolchain required for the maintenance simultaneous release. + JavaSE-1.8 + + + + + false + + + + hudson-plugins-build_timeout-BuildTimeoutWrapper + + + 3 + false + false + 300 + elastic + 60 + + false + true + + + + hudson-triggers-SCMTrigger + + + 0-59/5 * * * * + + false + + + + builders + + + + # Manual implementation of the "Clean after checkout" option of the Hudson Git plugin. +# See <https://bugs.eclipse.org/bugs/show_bug.cgi?id=464597>. +git clean -fdx -e .maven/ + + + # Ensure that a window manager is running. +# See <https://bugs.eclipse.org/bugs/show_bug.cgi?id=387721> + +ICEWM_PRIVCFG="$WORKSPACE/.icewm/" icewm --no-configure & + + + + apache-maven-latest + clean deploy + true + true + pom.xml + + + + + + + + + + + true + NORMAL + false + NORMAL + + build-server + + true + STRICT + AT_END + NONE + -Xmx1024m -XX:MaxPermSize=128m + NONE + 970a9fe1-b930-4efa-a285-15e6ed12490e + NONE + + + + false + + + + hudson-tasks-ArtifactArchiver + + + repositories/*/target/repository/**, target/jacoco.exec + GZIP + false + false + + false + true + + + + touchStoneResultCondition + + + SUCCESS + 0 + GREEN + + false + + + + scm + + + 1 + + + origin + + + git + /gitroot/recommenders/org.eclipse.recommenders.git + /gitroot/recommenders/org.eclipse.recommenders.git + -1 + git.eclipse.org + + + + + + true + true + refs/heads/* + refs/remotes/origin/* + + + + git-upload-pack + git-receive-pack + AUTO_FOLLOW + false + 0 + + + + + + maintenance + + + + false + false + false + false + false + false + false + false + + Default + + + + + + + + false + + false + + + + hudson-triggers-TimerTrigger + + + # Run a daily sanity build, in particular to check whether all upstream update sites are still working for us. +0 0 * * * + + false + + + + false + someone@somewhere.com + 1437057571740 + + + + hudson-plugins-promoted_builds-JobPropertyImpl + hudson-plugins-disk_usage-DiskUsageProperty + + + false + false + false + false + false + false + + false + false + \ No newline at end of file diff --git a/xml/reference/config.job.hudson-recommenders.transformed_reference.xml b/xml/reference/config.job.hudson-recommenders.transformed_reference.xml new file mode 100644 index 0000000..b7b85cd --- /dev/null +++ b/xml/reference/config.job.hudson-recommenders.transformed_reference.xml @@ -0,0 +1,183 @@ + + + <p>This job is responsible for populating the following update sites with maintenance versions of Code Recommenders: <a href="http://download.eclipse.org/recommenders/updates/maintenance-head/">maintenance-head</a>, <a href="http://download.eclipse.org/recommenders/updates/maintenance-milestones/">maintenance-milestones</a>, and <a href="http://download.eclipse.org/recommenders/updates/stable/">stable</a>.</p> + +<p>This job also deploys <em>release</em> and <em>snapshot</em> Maven artifacts to <a href="https://repo.eclipse.org/content/groups/recommenders/">repo.eclipse.org</a>.</p> + +<p>Moreover, this job <strong>may</strong> populate the update sites for both the current and the maintenance simultaneous release.</p> + false + + + + -1 + 10 + 7 + -1 + + + + + + milestones + current-simrel + maintenance-simrel + head + stable + + + + + + CURRENT_SIMREL + The simultaneous release that is currently heading for its first release. (Until 2018-06-27, this will be <em>photon</em>.) + photon + + + CURRENT_TOOLCHAIN + The toolchain required for the current simultaneous release. + JavaSE-1.8 + + + MAINTENANCE_SIMREL + The simultaneous release that is currently in maintenance mode, i.e., which is supplied with service releases. (Until the final <em>photon</em> RC, this will be <em>oxygen</em>.) + oxygen + + + MAINTENANCE_TOOLCHAIN + The toolchain required for the maintenance simultaneous release. + JavaSE-1.8 + + + + + + + + origin + +refs/heads/*:refs/remotes/origin/* + git://git.eclipse.org/gitroot/recommenders/org.eclipse.recommenders.git + + + + + maintenance + + + false + + + + false + false + false + false + + + 0-59/5 * * * * + + + # Run a daily sanity build, in particular to check whether all upstream update sites are still working for us. +0 0 * * * + + + + + simrel + + mars + neon + oxygen + photon + + + + toolchain + + JavaSE-1.7 + JavaSE-1.8 + + + + ((simrel == "mars") && toolchain == "JavaSE-1.7") || ((simrel == "neon" || simrel == "oxygen" || simrel == "photon") && toolchain == "JavaSE-1.8") + + + # Manual implementation of the "Clean after checkout" option of the Hudson Git plugin. +# See <https://bugs.eclipse.org/bugs/show_bug.cgi?id=464597>. +git clean -fdx -e .maven/ + + + # Ensure that a window manager is running. +# See <https://bugs.eclipse.org/bugs/show_bug.cgi?id=387721> + +ICEWM_PRIVCFG="$WORKSPACE/.icewm/" icewm --no-configure & + + + clean deploy -Pbuild-server + apache-maven-latest + -Xmx1024m -XX:MaxPermSize=128m + pom.xml + tycho.disableP2Mirrors=true +installAtEnd=true +deployAtEnd=true +tycho.localArtifacts=ignore +retryFailedDeploymentCount=10 +updateSitePrefix=maintenance- + + true + + + + + + + low + [CHECKSTYLE] + + false + false + false + + + + + + + + + + + false + true + false + + + + someone@somewhere.com + false + true + + + **/target/surefire-reports/*.xml + false + + + + repositories/*/target/repository/**, target/jacoco.exec + GZIP + false + false + + + + + + 300 + 60 + + + + + false + + +