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

fix(cnbBuild): Create separate temp folder for each creator call (#3910)

Browse Source 
Co-authored-by: Pavel Busko <pavel.busko@sap.com>
This commit is contained in:
Ralf Pannemans
2022-08-01 17:02:52 +02:00
committed by GitHub
parent 3cad6ac2cd
commit 2f1f4b18ac
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/cnbBuild.go
View File

@@ -409,6 +409,16 @@ func runCnbBuild(config *cnbBuildOptions, cnbTelemetry *cnbBuildTelemetry, utils
return errors.Wrap(err, fmt.Sprintf("failed to clean up platform folder %s", platformPath))
}
tempdir, err := os.MkdirTemp("", "cnbBuild-")
if err != nil {
return errors.Wrap(err, "failed to create tempdir")
}
defer os.RemoveAll(tempdir)
if config.BuildEnvVars == nil {
config.BuildEnvVars = map[string]interface{}{}
}
config.BuildEnvVars["TMPDIR"] = tempdir
customTelemetryData := cnbBuildTelemetryData{}
addConfigTelemetryData(utils, &customTelemetryData, cnbTelemetry.dockerImage, config)

3
integration/integration_cnb_test.go
View File

@@ -93,10 +93,9 @@ func TestProjectDescriptor(t *testing.T) {
container.assertHasOutput(t, "running command: /cnb/lifecycle/creator")
container.assertHasOutput(t, "Dockerfile doesn't match include pattern, ignoring")
container.assertHasOutput(t, "srv/hello.js matches include pattern")
container.assertHasOutput(t, "srv/hello.js matches include pattern")
container.assertHasOutput(t, "package.json matches include pattern")
container.assertHasOutput(t, "Downloading buildpack")
container.assertHasOutput(t, "Setting custom environment variables: 'map[BP_NODE_VERSION:16]'")
container.assertHasOutput(t, "Setting custom environment variables: 'map[BP_NODE_VERSION:16 TMPDIR:/tmp/cnbBuild-")
container.assertHasOutput(t, "Selected Node Engine version (using BP_NODE_VERSION): 16")
container.assertHasOutput(t, "Paketo NPM Start Buildpack")
container.assertHasOutput(t, fmt.Sprintf("Saving %s/not-found:0.0.1", registryURL))

2
integration/testdata/TestCnbIntegration/project/project-with-id.toml vendored
View File

@@ -20,7 +20,7 @@ version = "3.2.4"
uri = "gcr.io/paketo-buildpacks/node-engine:0.14.0"
[[build.buildpacks]]
uri = "gcr.io/paketo-buildpacks/npm-install:0.10.0"
uri = "gcr.io/paketo-buildpacks/npm-install:0.10.2"
[[build.buildpacks]]
uri = "gcr.io/paketo-buildpacks/node-module-bom:0.3.0"

2
integration/testdata/TestCnbIntegration/project/project.toml vendored
View File

@@ -19,7 +19,7 @@ uri = "gcr.io/paketo-buildpacks/ca-certificates:3.2.4"
uri = "gcr.io/paketo-buildpacks/node-engine:0.14.0"
[[build.buildpacks]]
uri = "gcr.io/paketo-buildpacks/npm-install:0.10.0"
uri = "gcr.io/paketo-buildpacks/npm-install:0.10.2"
[[build.buildpacks]]
uri = "gcr.io/paketo-buildpacks/node-module-bom:0.3.0"