jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-18 05:18:24 +02:00
Code Issues Releases Activity

fix(whitesource) use mta image without npm.sap.com (#2760)

Browse Source 
* fix npm.sap.com issue

* use latest

* go generate

* use fixed version 1.0.16.1

* mbt version for tests also changed
This commit is contained in:
Andre 2021-04-16 13:40:10 +02:00 committed by GitHub
parent b531c2a017
commit 559bcd1ef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/whitesourceExecuteScan_generated.go
View File

@ -617,7 +617,7 @@ func whitesourceExecuteScanMetadata() config.StepData {
},
Containers: []config.Container{
{Image: "buildpack-deps:stretch-curl", WorkingDir: "/tmp", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "dub"}, {Name: "buildTool", Value: "docker"}}}}},
{Image: "devxci/mbtci:1.0.14", WorkingDir: "/home/mta", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "mta"}}}}},
{Image: "devxci/mbtci:1.0.16.1", WorkingDir: "/home/mta", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "mta"}}}}},
{Image: "golang:1", WorkingDir: "/go", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "golang"}}}}},
{Image: "hseeberger/scala-sbt:8u181_2.12.8_1.2.8", WorkingDir: "/tmp", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "sbt"}}}}},
{Image: "maven:3.5-jdk-8", WorkingDir: "/tmp", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "maven"}}}}},

8
integration/integration_mta_build_test.go
View File

@ -10,7 +10,7 @@ import (
func TestMavenProject(t *testing.T) {
t.Parallel()
container := givenThisContainer(t, IntegrationTestDockerExecRunnerBundle{
Image: "devxci/mbtci:latest",
Image: "devxci/mbtci:1.0.16.1",
User: "root",
TestDir: []string{"testdata", "TestMtaIntegration", "maven"},
})
@ -29,7 +29,7 @@ func TestMavenProject(t *testing.T) {
func TestMavenSpringProject(t *testing.T) {
t.Parallel()
container := givenThisContainer(t, IntegrationTestDockerExecRunnerBundle{
Image: "devxci/mbtci:latest",
Image: "devxci/mbtci:1.0.16.1",
User: "root",
TestDir: []string{"testdata", "TestMtaIntegration", "maven-spring"},
})
@ -49,7 +49,7 @@ func TestMavenSpringProject(t *testing.T) {
func TestNPMProject(t *testing.T) {
t.Parallel()
container := givenThisContainer(t, IntegrationTestDockerExecRunnerBundle{
Image: "devxci/mbtci:latest",
Image: "devxci/mbtci:1.0.16.1",
User: "root",
TestDir: []string{"testdata", "TestMtaIntegration", "npm"},
})
@ -65,7 +65,7 @@ func TestNPMProject(t *testing.T) {
func TestNPMProjectInstallsDevDependencies(t *testing.T) {
t.Parallel()
container := givenThisContainer(t, IntegrationTestDockerExecRunnerBundle{
Image: "devxci/mbtci:latest",
Image: "devxci/mbtci:1.0.16.1",
User: "root",
TestDir: []string{"testdata", "TestMtaIntegration", "npm-install-dev-dependencies"},
})

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

@ -1,3 +1,3 @@
FROM devxci/mbtci:1.0.14
FROM devxci/mbtci:1.0.16.1
COPY run-in-container.sh /test.sh

2
resources/metadata/whitesource.yaml
View File

@ -474,7 +474,7 @@ spec:
value: dub
- name: buildTool
value: docker
- image: devxci/mbtci:1.0.14
- image: devxci/mbtci:1.0.16.1
workingDir: /home/mta
env: [ ]
conditions: