Skip to content
This repository was archived by the owner on Feb 23, 2021. It is now read-only.

Commit 81a506c

Browse files
committed
Add support for matrix projects
1 parent 30d2cd7 commit 81a506c

File tree

5 files changed

+501
-2
lines changed

5 files changed

+501
-2
lines changed

src/main/java/org/eclipse/cbi/hipp2jipp/XslTransformer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public static String getXslFileName(File inputFile) {
163163
String xslFileName = "";
164164
if ("build".equalsIgnoreCase(rootNodeName)) {
165165
xslFileName = BUILD_XSL;
166-
} else if ("project".equalsIgnoreCase(rootNodeName) || "maven2-moduleset".equalsIgnoreCase(rootNodeName)) {
166+
} else if ("project".equalsIgnoreCase(rootNodeName) || "maven2-moduleset".equalsIgnoreCase(rootNodeName) || "matrix-project".equalsIgnoreCase(rootNodeName)) {
167167
xslFileName = JOB_CONFIG_XSL;
168168
} else if ("hudson".equalsIgnoreCase(rootNodeName)) {
169169
xslFileName = GENERAL_CONFIG_XSL;

src/main/resources/xsl/config.job.xsl

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
33

4-
<xsl:template match="/project | /maven2-moduleset">
4+
<xsl:template match="/project | /maven2-moduleset | /matrix-project">
55
<!--
66
<xsl:message terminate="no">
77
WARNING: Unmatched element:
@@ -34,6 +34,11 @@
3434
<xsl:apply-templates select="project-properties/entry [contains(string/text(), 'GerritTrigger')]"/>
3535
</triggers>
3636
<xsl:apply-templates select="project-properties/entry [string/text() = 'concurrentBuild']"/>
37+
<xsl:if test="/matrix-project">
38+
<axes>
39+
<xsl:apply-templates select="project-properties/entry [string/text() = 'axes']"/>
40+
</axes>
41+
</xsl:if>
3742
<xsl:apply-templates select="project-properties/entry [string/text() = 'customWorkspace']"/>
3843
<xsl:if test="/maven2-moduleset">
3944
<!-- Matches for Maven job -->
@@ -198,6 +203,11 @@
198203
<xsl:copy-of select="*/originalValue/*" />
199204
</xsl:template>
200205

206+
<!-- Matrix project axes -->
207+
<xsl:template match="/*/project-properties/entry [string/text() = 'axes']">
208+
<xsl:copy-of select="*/originalValue/*" />
209+
</xsl:template>
210+
201211
<!-- String, Int, Boolean, etc -->
202212
<xsl:template match="/*/project-properties/entry [(*/originalValue/@class = 'string' or */originalValue/@class = 'int' or */originalValue/@class = 'boolean' or */originalValue/@class = '') and not(string/text() = 'cleanWorkspaceRequired')]">
203213
<xsl:variable name="tagName">

src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,14 @@ public void configJobTest_xtext3() {
319319
transformAndCompareFreestyleJob("xtext3");
320320
}
321321

322+
/**
323+
* Tests that matrix jobs are transformed correctly
324+
*/
325+
@Test
326+
public void configJobTest_andmore() {
327+
transformAndCompare("andmore", "config.job.hudson", "matrix-project");
328+
}
329+
322330
@Test
323331
public void copyViewsTest_positive() {
324332
testCopyViews("config.main.jenkins-cbi.xml", "config.main.hudson-cbi.xml");

0 commit comments

Comments
 (0)