jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-09-16 09:26:22 +02:00
Code Issues Releases Activity

fix(deps): Updated mtaBuild docker image (#5419)

Browse Source
This commit is contained in:
petkodimitrov24
2025-08-18 07:37:46 +03:00
committed by GitHub
parent 6c4d10f7d3
commit 29a2bcea2a
6 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/mtaBuild_generated.go
View File

@@ -543,7 +543,7 @@ func mtaBuildMetadata() config.StepData {
},
},
Containers: []config.Container{
{Image: "devxci/mbtci-java11-node14"},
{Image: "devxci/mbtci-java21-node22"},
},
Outputs: config.StepOutputs{
Resources: []config.StepResources{

12
integration/integration_mta_test.go
View File

@@ -13,7 +13,7 @@ import (
func TestMTAIntegrationMavenProject(t *testing.T) {
// t.Parallel()
container := givenThisContainer(t, IntegrationTestDockerExecRunnerBundle{
Image: "devxci/mbtci-java11-node14",
Image: "devxci/mbtci-java21-node22",
User: "root",
TestDir: []string{"testdata", "TestMtaIntegration", "maven"},
})
@@ -28,14 +28,14 @@ func TestMTAIntegrationMavenProject(t *testing.T) {
"Installing /project/.flattened-pom.xml to /project/mym2/mygroup/mymvn/1.0-SNAPSHOT/mymvn-1.0-SNAPSHOT.pom",
"Installing /project/app/target/mymvn-app-1.0-SNAPSHOT.war to /project/mym2/mygroup/mymvn-app/1.0-SNAPSHOT/mymvn-app-1.0-SNAPSHOT.war",
"Installing /project/app/target/mymvn-app-1.0-SNAPSHOT-classes.jar to /project/mym2/mygroup/mymvn-app/1.0-SNAPSHOT/mymvn-app-1.0-SNAPSHOT-classes.jar",
"added 2 packages from 3 contributors and audited 2 packages in",
"added 2 packages, and audited 3 packages in",
)
}
func TestMTAIntegrationMavenSpringProject(t *testing.T) {
// t.Parallel()
container := givenThisContainer(t, IntegrationTestDockerExecRunnerBundle{
Image: "devxci/mbtci-java11-node14",
Image: "devxci/mbtci-java21-node22",
User: "root",
TestDir: []string{"testdata", "TestMtaIntegration", "maven-spring"},
})
@@ -56,7 +56,7 @@ func TestMTAIntegrationMavenSpringProject(t *testing.T) {
func TestMTAIntegrationNPMProject(t *testing.T) {
// t.Parallel()
container := givenThisContainer(t, IntegrationTestDockerExecRunnerBundle{
Image: "devxci/mbtci-java11-node14",
Image: "devxci/mbtci-java21-node22",
User: "root",
TestDir: []string{"testdata", "TestMtaIntegration", "npm"},
})
@@ -73,7 +73,7 @@ func TestMTAIntegrationNPMProject(t *testing.T) {
func TestMTAIntegrationNPMProjectInstallsDevDependencies(t *testing.T) {
// t.Parallel()
container := givenThisContainer(t, IntegrationTestDockerExecRunnerBundle{
Image: "devxci/mbtci-java11-node14",
Image: "devxci/mbtci-java21-node22",
User: "root",
TestDir: []string{"testdata", "TestMtaIntegration", "npm-install-dev-dependencies"},
})
@@ -84,5 +84,5 @@ func TestMTAIntegrationNPMProjectInstallsDevDependencies(t *testing.T) {
t.Fatalf("Piper command failed %s", err)
}
container.assertHasOutput(t, "added 2 packages in")
container.assertHasOutput(t, "added 2 packages, and audited 3 packages in")
}

4
integration/testdata/TestMtaIntegration/maven-spring/app/pom.xml vendored
View File

@@ -15,8 +15,8 @@
<version>1.0-SNAPSHOT</version>
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
</project>

7
integration/testdata/TestMtaIntegration/maven/app/pom.xml vendored
View File

@@ -12,12 +12,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<version>3.2.3</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<attachClasses>true</attachClasses>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
</plugin>
</plugins>
</build>
</project>

2
integration/testdata/TestMtaIntegration/npm/Dockerfile vendored
View File

@@ -1,3 +1,3 @@
FROM devxci/mbtci-java11-node14
FROM devxci/mbtci-java21-node22
COPY run-in-container.sh /test.sh

2
resources/metadata/mtaBuild.yaml
View File

@@ -272,4 +272,4 @@ spec:
- filePattern: "**/jacoco.xml"
type: jacoco-coverage
containers:
- image: devxci/mbtci-java11-node14
- image: devxci/mbtci-java21-node22