From 29059f51c4d699842be4900b35d61764f2374151 Mon Sep 17 00:00:00 2001 From: Valentin <16714035+bitmaskit@users.noreply.github.com> Date: Mon, 7 Apr 2025 12:53:37 +0300 Subject: [PATCH] chore(): Replaced node version `lts-buster` with `lts-bookworm` (#5286) Co-authored-by: Valentin Uchkunev --- cmd/batsExecuteTests_generated.go | 2 +- cmd/gaugeExecuteTests_generated.go | 2 +- cmd/karmaExecuteTests_generated.go | 4 ++-- cmd/newmanExecute_generated.go | 2 +- cmd/npmExecuteLint_generated.go | 2 +- cmd/npmExecuteScripts_generated.go | 2 +- cmd/shellExecute_generated.go | 2 +- cmd/uiVeri5ExecuteTests_generated.go | 2 +- cmd/whitesourceExecuteScan_generated.go | 4 ++-- integration/integration_dummy_test.go | 2 +- integration/integration_gauge_test.go | 2 +- integration/integration_karma_test.go | 2 +- resources/default_pipeline_environment.yml | 14 +++++++------- resources/metadata/batsExecuteTests.yaml | 2 +- resources/metadata/gaugeExecuteTests.yaml | 2 +- resources/metadata/karmaExecuteTests.yaml | 4 ++-- resources/metadata/newmanExecute.yaml | 4 ++-- resources/metadata/npmExecuteLint.yaml | 2 +- resources/metadata/npmExecuteScripts.yaml | 2 +- resources/metadata/shellExecute.yaml | 2 +- resources/metadata/uiVeri5ExecuteTests.yaml | 4 ++-- resources/metadata/whitesourceExecuteScan.yaml | 4 ++-- test/groovy/NpmExecuteTest.groovy | 8 ++++---- test/groovy/SeleniumExecuteTestsTest.groovy | 2 +- test/groovy/SnykExecuteTest.groovy | 2 +- 25 files changed, 40 insertions(+), 40 deletions(-) diff --git a/cmd/batsExecuteTests_generated.go b/cmd/batsExecuteTests_generated.go index 4054c2d99..d96418e60 100644 --- a/cmd/batsExecuteTests_generated.go +++ b/cmd/batsExecuteTests_generated.go @@ -251,7 +251,7 @@ func batsExecuteTestsMetadata() config.StepData { }, }, Containers: []config.Container{ - {Name: "bats", Image: "node:lts-buster", WorkingDir: "/home/node", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "outputFormat", Value: "junit"}}}}}, + {Name: "bats", Image: "node:lts-bookworm", WorkingDir: "/home/node", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "outputFormat", Value: "junit"}}}}}, }, Outputs: config.StepOutputs{ Resources: []config.StepResources{ diff --git a/cmd/gaugeExecuteTests_generated.go b/cmd/gaugeExecuteTests_generated.go index f80ca3ab6..5615127b5 100644 --- a/cmd/gaugeExecuteTests_generated.go +++ b/cmd/gaugeExecuteTests_generated.go @@ -297,7 +297,7 @@ func gaugeExecuteTestsMetadata() config.StepData { }, }, Containers: []config.Container{ - {Name: "gauge", Image: "node:lts-buster", EnvVars: []config.EnvVar{{Name: "no_proxy", Value: "localhost,selenium,$no_proxy"}, {Name: "NO_PROXY", Value: "localhost,selenium,$NO_PROXY"}}, WorkingDir: "/home/node"}, + {Name: "gauge", Image: "node:lts-bookworm", EnvVars: []config.EnvVar{{Name: "no_proxy", Value: "localhost,selenium,$no_proxy"}, {Name: "NO_PROXY", Value: "localhost,selenium,$NO_PROXY"}}, WorkingDir: "/home/node"}, }, Sidecars: []config.Container{ {Name: "selenium", Image: "selenium/standalone-chrome", EnvVars: []config.EnvVar{{Name: "NO_PROXY", Value: "localhost,selenium,$NO_PROXY"}, {Name: "no_proxy", Value: "localhost,selenium,$no_proxy"}}}, diff --git a/cmd/karmaExecuteTests_generated.go b/cmd/karmaExecuteTests_generated.go index f870d85ad..67418a58e 100644 --- a/cmd/karmaExecuteTests_generated.go +++ b/cmd/karmaExecuteTests_generated.go @@ -86,7 +86,7 @@ func KarmaExecuteTestsCommand() *cobra.Command { The step is using the ` + "`" + `seleniumExecuteTest` + "`" + ` step to spin up two containers in a Docker network: * a Selenium/Chrome container (` + "`" + `selenium/standalone-chrome` + "`" + `) -* a NodeJS container (` + "`" + `node:lts-buster` + "`" + `) +* a NodeJS container (` + "`" + `node:lts-bookworm` + "`" + `) In the Docker network, the containers can be referenced by the values provided in ` + "`" + `dockerName` + "`" + ` and ` + "`" + `sidecarName` + "`" + `, the default values are ` + "`" + `karma` + "`" + ` and ` + "`" + `selenium` + "`" + `. These values must be used in the ` + "`" + `hostname` + "`" + ` properties of the test configuration ([Karma](https://karma-runner.github.io/1.0/config/configuration-file.html) and [WebDriver](https://github.com/karma-runner/karma-webdriver-launcher#usage)). @@ -255,7 +255,7 @@ func karmaExecuteTestsMetadata() config.StepData { }, }, Containers: []config.Container{ - {Name: "karma", Image: "node:lts-buster", EnvVars: []config.EnvVar{{Name: "no_proxy", Value: "localhost,selenium,$no_proxy"}, {Name: "NO_PROXY", Value: "localhost,selenium,$NO_PROXY"}, {Name: "PIPER_SELENIUM_HOSTNAME", Value: "karma"}, {Name: "PIPER_SELENIUM_WEBDRIVER_HOSTNAME", Value: "selenium"}, {Name: "PIPER_SELENIUM_WEBDRIVER_PORT", Value: "4444"}}, WorkingDir: "/home/node"}, + {Name: "karma", Image: "node:lts-bookworm", EnvVars: []config.EnvVar{{Name: "no_proxy", Value: "localhost,selenium,$no_proxy"}, {Name: "NO_PROXY", Value: "localhost,selenium,$NO_PROXY"}, {Name: "PIPER_SELENIUM_HOSTNAME", Value: "karma"}, {Name: "PIPER_SELENIUM_WEBDRIVER_HOSTNAME", Value: "selenium"}, {Name: "PIPER_SELENIUM_WEBDRIVER_PORT", Value: "4444"}}, WorkingDir: "/home/node"}, }, Sidecars: []config.Container{ {Name: "selenium", Image: "selenium/standalone-chrome", EnvVars: []config.EnvVar{{Name: "NO_PROXY", Value: "localhost,karma,$NO_PROXY"}, {Name: "no_proxy", Value: "localhost,selenium,$no_proxy"}}}, diff --git a/cmd/newmanExecute_generated.go b/cmd/newmanExecute_generated.go index 8c7379767..3dd60c583 100644 --- a/cmd/newmanExecute_generated.go +++ b/cmd/newmanExecute_generated.go @@ -326,7 +326,7 @@ func newmanExecuteMetadata() config.StepData { }, }, Containers: []config.Container{ - {Name: "newman", Image: "node:lts-buster", WorkingDir: "/home/node"}, + {Name: "newman", Image: "node:lts-bookworm", WorkingDir: "/home/node"}, }, Outputs: config.StepOutputs{ Resources: []config.StepResources{ diff --git a/cmd/npmExecuteLint_generated.go b/cmd/npmExecuteLint_generated.go index 2665c85f4..8f8773372 100644 --- a/cmd/npmExecuteLint_generated.go +++ b/cmd/npmExecuteLint_generated.go @@ -223,7 +223,7 @@ func npmExecuteLintMetadata() config.StepData { }, }, Containers: []config.Container{ - {Name: "node", Image: "node:lts-buster"}, + {Name: "node", Image: "node:lts-bookworm"}, }, }, } diff --git a/cmd/npmExecuteScripts_generated.go b/cmd/npmExecuteScripts_generated.go index 0de3729f4..1ca9af443 100644 --- a/cmd/npmExecuteScripts_generated.go +++ b/cmd/npmExecuteScripts_generated.go @@ -464,7 +464,7 @@ func npmExecuteScriptsMetadata() config.StepData { }, }, Containers: []config.Container{ - {Name: "node", Image: "node:lts-buster"}, + {Name: "node", Image: "node:lts-bookworm"}, }, Outputs: config.StepOutputs{ Resources: []config.StepResources{ diff --git a/cmd/shellExecute_generated.go b/cmd/shellExecute_generated.go index 5b31e8d71..934ef92f4 100644 --- a/cmd/shellExecute_generated.go +++ b/cmd/shellExecute_generated.go @@ -204,7 +204,7 @@ func shellExecuteMetadata() config.StepData { }, }, Containers: []config.Container{ - {Name: "shell", Image: "node:lts-buster", WorkingDir: "/home/node"}, + {Name: "shell", Image: "node:lts-bookworm", WorkingDir: "/home/node"}, }, }, } diff --git a/cmd/uiVeri5ExecuteTests_generated.go b/cmd/uiVeri5ExecuteTests_generated.go index 96df94d90..e618a621c 100644 --- a/cmd/uiVeri5ExecuteTests_generated.go +++ b/cmd/uiVeri5ExecuteTests_generated.go @@ -260,7 +260,7 @@ func uiVeri5ExecuteTestsMetadata() config.StepData { }, }, Containers: []config.Container{ - {Name: "uiVeri5", Image: "node:lts-buster", EnvVars: []config.EnvVar{{Name: "no_proxy", Value: "localhost,selenium,$no_proxy"}, {Name: "NO_PROXY", Value: "localhost,selenium,$NO_PROXY"}}, WorkingDir: "/home/node"}, + {Name: "uiVeri5", Image: "node:lts-bookworm", EnvVars: []config.EnvVar{{Name: "no_proxy", Value: "localhost,selenium,$no_proxy"}, {Name: "NO_PROXY", Value: "localhost,selenium,$NO_PROXY"}}, WorkingDir: "/home/node"}, }, Sidecars: []config.Container{ {Name: "selenium", Image: "selenium/standalone-chrome", EnvVars: []config.EnvVar{{Name: "NO_PROXY", Value: "localhost,selenium,$NO_PROXY"}, {Name: "no_proxy", Value: "localhost,selenium,$no_proxy"}}}, diff --git a/cmd/whitesourceExecuteScan_generated.go b/cmd/whitesourceExecuteScan_generated.go index 89280d6ac..8f5bd6172 100644 --- a/cmd/whitesourceExecuteScan_generated.go +++ b/cmd/whitesourceExecuteScan_generated.go @@ -1114,9 +1114,9 @@ func whitesourceExecuteScanMetadata() config.StepData { {Image: "gradle", WorkingDir: "/home/gradle", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "gradle"}}}}}, {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"}}}}}, - {Image: "node:lts-buster", WorkingDir: "/home/node", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "npm"}}}}}, + {Image: "node:lts-bookworm", WorkingDir: "/home/node", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "npm"}}}}}, {Image: "python:3.6-stretch", WorkingDir: "/tmp", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "pip"}}}}}, - {Image: "node:lts-buster", WorkingDir: "/home/node", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "yarn"}}}}}, + {Image: "node:lts-bookworm", WorkingDir: "/home/node", Conditions: []config.Condition{{ConditionRef: "strings-equal", Params: []config.Param{{Name: "buildTool", Value: "yarn"}}}}}, }, Outputs: config.StepOutputs{ Resources: []config.StepResources{ diff --git a/integration/integration_dummy_test.go b/integration/integration_dummy_test.go index bfb2351bb..b73cc5c72 100644 --- a/integration/integration_dummy_test.go +++ b/integration/integration_dummy_test.go @@ -26,7 +26,7 @@ func TestDummyIntegration(t *testing.T) { dir = filepath.Dir(dir) req := testcontainers.ContainerRequest{ - Image: "node:lts-buster", + Image: "node:lts-bookworm", Cmd: []string{"tail", "-f"}, Mounts: testcontainers.Mounts( testcontainers.BindMount(dir, "/data"), diff --git a/integration/integration_gauge_test.go b/integration/integration_gauge_test.go index b3a3fbd4c..19934e71f 100644 --- a/integration/integration_gauge_test.go +++ b/integration/integration_gauge_test.go @@ -56,7 +56,7 @@ cd /test } if languageRunner == "js" { - reqNode.Image = "node:lts-buster" + reqNode.Image = "node:lts-bookworm" } nodeContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{ diff --git a/integration/integration_karma_test.go b/integration/integration_karma_test.go index 0671695c7..e1f7bce7a 100644 --- a/integration/integration_karma_test.go +++ b/integration/integration_karma_test.go @@ -46,7 +46,7 @@ cd /test networkName := "sidecar-" + uuid.New().String() reqNode := testcontainers.ContainerRequest{ - Image: "node:lts-buster", + Image: "node:lts-bookworm", Cmd: []string{"tail", "-f"}, Mounts: testcontainers.Mounts( testcontainers.BindMount(pwd, "/piperbin"), diff --git a/resources/default_pipeline_environment.yml b/resources/default_pipeline_environment.yml index 45aef06f4..a1da3359b 100644 --- a/resources/default_pipeline_environment.yml +++ b/resources/default_pipeline_environment.yml @@ -102,7 +102,7 @@ steps: versioningTemplate: '${version}-${timestamp}${commitId?"+"+commitId:""}' batsExecuteTests: #TODO: check wheather defaults in here are still required - dockerImage: 'node:lts-buster' + dockerImage: 'node:lts-bookworm' dockerWorkspace: '/home/node' envVars: {} outputFormat: 'junit' # tap, junit @@ -271,7 +271,7 @@ steps: testOptions: '-DspecsDir=specs' npm: #TODO: check wheather defaults in here are still required - dockerImage: 'node:lts-buster' + dockerImage: 'node:lts-bookworm' dockerName: 'npm' dockerWorkspace: '/home/node' languageRunner: 'js' @@ -306,14 +306,14 @@ steps: influxServer: '' karmaExecuteTests: containerPortMappings: - 'node:lts-buster': + 'node:lts-bookworm': - containerPort: 9876 hostPort: 9876 dockerEnvVars: NO_PROXY: 'localhost,selenium,$NO_PROXY' no_proxy: 'localhost,selenium,$no_proxy' #TODO: check wheather defaults in here are still required - dockerImage: 'node:lts-buster' + dockerImage: 'node:lts-bookworm' dockerName: 'karma' dockerWorkspace: '/home/node' installCommand: 'npm install --quiet' @@ -355,7 +355,7 @@ steps: parallelExecution: false npmExecute: #TODO: check wheather defaults in here are still required - dockerImage: 'node:lts-buster' + dockerImage: 'node:lts-bookworm' npmExecuteScripts: install: true npmExecuteEndToEndTests: @@ -435,7 +435,7 @@ steps: dockerName: 'maven' dockerWorkspace: '' npm: - dockerImage: 'node:lts-buster' + dockerImage: 'node:lts-bookworm' dockerName: 'npm' dockerWorkspace: '/home/node' bundler: @@ -447,7 +447,7 @@ steps: defaultMessage: "${buildStatus}: Job ${env.JOB_NAME} <${env.BUILD_URL}|#${env.BUILD_NUMBER}>" snykExecute: buildDescriptorFile: './package.json' - dockerImage: 'node:lts-buster' + dockerImage: 'node:lts-bookworm' exclude: [] monitor: true scanType: 'npm' diff --git a/resources/metadata/batsExecuteTests.yaml b/resources/metadata/batsExecuteTests.yaml index 43614b4d5..9205de66e 100644 --- a/resources/metadata/batsExecuteTests.yaml +++ b/resources/metadata/batsExecuteTests.yaml @@ -60,7 +60,7 @@ spec: type: bool containers: - name: bats - image: node:lts-buster + image: node:lts-bookworm workingDir: /home/node conditions: - conditionRef: strings-equal diff --git a/resources/metadata/gaugeExecuteTests.yaml b/resources/metadata/gaugeExecuteTests.yaml index 36edf903e..452ffa0e9 100644 --- a/resources/metadata/gaugeExecuteTests.yaml +++ b/resources/metadata/gaugeExecuteTests.yaml @@ -75,7 +75,7 @@ spec: type: delivery-mapping containers: - name: gauge - image: node:lts-buster + image: node:lts-bookworm env: - name: no_proxy value: localhost,selenium,$no_proxy diff --git a/resources/metadata/karmaExecuteTests.yaml b/resources/metadata/karmaExecuteTests.yaml index 805982c84..dd2b17660 100644 --- a/resources/metadata/karmaExecuteTests.yaml +++ b/resources/metadata/karmaExecuteTests.yaml @@ -7,7 +7,7 @@ metadata: The step is using the `seleniumExecuteTest` step to spin up two containers in a Docker network: * a Selenium/Chrome container (`selenium/standalone-chrome`) - * a NodeJS container (`node:lts-buster`) + * a NodeJS container (`node:lts-bookworm`) In the Docker network, the containers can be referenced by the values provided in `dockerName` and `sidecarName`, the default values are `karma` and `selenium`. These values must be used in the `hostname` properties of the test configuration ([Karma](https://karma-runner.github.io/1.0/config/configuration-file.html) and [WebDriver](https://github.com/karma-runner/karma-webdriver-launcher#usage)). @@ -75,7 +75,7 @@ spec: type: requirement-mapping containers: - name: karma - image: node:lts-buster + image: node:lts-bookworm env: - name: no_proxy value: localhost,selenium,$no_proxy diff --git a/resources/metadata/newmanExecute.yaml b/resources/metadata/newmanExecute.yaml index 08df0e935..5a691f6c6 100644 --- a/resources/metadata/newmanExecute.yaml +++ b/resources/metadata/newmanExecute.yaml @@ -16,7 +16,7 @@ spec: - STAGES - STEPS type: string - default: '**/*.postman_collection.json' + default: "**/*.postman_collection.json" - name: newmanRunCommand description: +++ Deprecated +++ Please use list parameter `runOptions` instead. scope: @@ -100,5 +100,5 @@ spec: type: delivery-mapping containers: - name: newman - image: node:lts-buster + image: node:lts-bookworm workingDir: /home/node diff --git a/resources/metadata/npmExecuteLint.yaml b/resources/metadata/npmExecuteLint.yaml index 960890f2d..650ceace5 100644 --- a/resources/metadata/npmExecuteLint.yaml +++ b/resources/metadata/npmExecuteLint.yaml @@ -71,4 +71,4 @@ spec: - name: npm/outputFormat containers: - name: node - image: node:lts-buster + image: node:lts-bookworm diff --git a/resources/metadata/npmExecuteScripts.yaml b/resources/metadata/npmExecuteScripts.yaml index 529c6d32c..aee4f7ef1 100644 --- a/resources/metadata/npmExecuteScripts.yaml +++ b/resources/metadata/npmExecuteScripts.yaml @@ -191,4 +191,4 @@ spec: type: cucumber containers: - name: node - image: node:lts-buster + image: node:lts-bookworm diff --git a/resources/metadata/shellExecute.yaml b/resources/metadata/shellExecute.yaml index 32dafb73b..b309d0a40 100644 --- a/resources/metadata/shellExecute.yaml +++ b/resources/metadata/shellExecute.yaml @@ -57,5 +57,5 @@ spec: mandatory: false containers: - name: shell - image: node:lts-buster + image: node:lts-bookworm workingDir: /home/node diff --git a/resources/metadata/uiVeri5ExecuteTests.yaml b/resources/metadata/uiVeri5ExecuteTests.yaml index 9e5dfdf9b..73167616c 100644 --- a/resources/metadata/uiVeri5ExecuteTests.yaml +++ b/resources/metadata/uiVeri5ExecuteTests.yaml @@ -6,7 +6,7 @@ metadata: # The step is using `dockerExecute` step to spin up two containers in a Docker network: # * a Selenium/Chrome container (`selenium/standalone-chrome`) -# * a NodeJS container (`node:lts-buster`) +# * a NodeJS container (`node:lts-bookworm`) # In the Docker network, the containers can be referenced by the values provided in `dockerName` and `sidecarName`, the default values are `uiVeri5` and `selenium`. # !!! note # In a Kubernetes environment, the containers both need to be referenced with `localhost`. @@ -74,7 +74,7 @@ spec: type: delivery-mapping containers: - name: uiVeri5 - image: node:lts-buster + image: node:lts-bookworm env: - name: no_proxy value: localhost,selenium,$no_proxy diff --git a/resources/metadata/whitesourceExecuteScan.yaml b/resources/metadata/whitesourceExecuteScan.yaml index 4b52fed5e..234698a46 100644 --- a/resources/metadata/whitesourceExecuteScan.yaml +++ b/resources/metadata/whitesourceExecuteScan.yaml @@ -796,7 +796,7 @@ spec: params: - name: buildTool value: maven - - image: node:lts-buster + - image: node:lts-bookworm workingDir: /home/node env: [] conditions: @@ -812,7 +812,7 @@ spec: params: - name: buildTool value: pip - - image: node:lts-buster + - image: node:lts-bookworm workingDir: /home/node env: [] conditions: diff --git a/test/groovy/NpmExecuteTest.groovy b/test/groovy/NpmExecuteTest.groovy index 0c5ad8880..9fd2fc47a 100644 --- a/test/groovy/NpmExecuteTest.groovy +++ b/test/groovy/NpmExecuteTest.groovy @@ -44,8 +44,8 @@ class NpmExecuteTest extends BasePiperTest { @Test void testNpmExecute() { - stepRule.step.npmExecute(script: nullScript, dockerImage: 'node:lts-buster') - assertEquals 'node:lts-buster', dockerExecuteRule.dockerParams.dockerImage + stepRule.step.npmExecute(script: nullScript, dockerImage: 'node:lts-bookworm') + assertEquals 'node:lts-bookworm', dockerExecuteRule.dockerParams.dockerImage } @Test @@ -76,7 +76,7 @@ class NpmExecuteTest extends BasePiperTest { @Test void testNpmExecuteWithClosure() { - stepRule.step.npmExecute(script: nullScript, dockerImage: 'node:lts-buster', npmCommand: 'run build') { } + stepRule.step.npmExecute(script: nullScript, dockerImage: 'node:lts-bookworm', npmCommand: 'run build') { } assert shellRule.shell.find { c -> c.contains('npm run build') } } @@ -85,6 +85,6 @@ class NpmExecuteTest extends BasePiperTest { helper.registerAllowedMethod 'fileExists', [String], { false } thrown.expect AbortException thrown.expectMessage '[npmExecute] package.json is not found.' - stepRule.step.npmExecute(script: nullScript, dockerImage: 'node:lts-buster', npmCommand: 'run build') + stepRule.step.npmExecute(script: nullScript, dockerImage: 'node:lts-bookworm', npmCommand: 'run build') } } diff --git a/test/groovy/SeleniumExecuteTestsTest.groovy b/test/groovy/SeleniumExecuteTestsTest.groovy index 121c972af..45da7c8a2 100644 --- a/test/groovy/SeleniumExecuteTestsTest.groovy +++ b/test/groovy/SeleniumExecuteTestsTest.groovy @@ -72,7 +72,7 @@ class SeleniumExecuteTestsTest extends BasePiperTest { } assertThat(bodyExecuted, is(true)) assertThat(dockerExecuteRule.dockerParams.containerPortMappings, is(['selenium/standalone-chrome': [[containerPort: 4444, hostPort: 4444]]])) - assertThat(dockerExecuteRule.dockerParams.dockerImage, is('node:lts-buster')) + assertThat(dockerExecuteRule.dockerParams.dockerImage, is('node:lts-bookworm')) assertThat(dockerExecuteRule.dockerParams.dockerName, is('npm')) assertThat(dockerExecuteRule.dockerParams.dockerWorkspace, is('/home/node')) assertThat(dockerExecuteRule.dockerParams.sidecarEnvVars, is(null)) diff --git a/test/groovy/SnykExecuteTest.groovy b/test/groovy/SnykExecuteTest.groovy index b6f399a58..1452ad6b7 100644 --- a/test/groovy/SnykExecuteTest.groovy +++ b/test/groovy/SnykExecuteTest.groovy @@ -100,7 +100,7 @@ class SnykExecuteTest extends BasePiperTest { ) assertThat(withCredentialsParameters.credentialsId, is('myPassword')) - assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'node:lts-buster')) + assertThat(dockerExecuteRule.dockerParams, hasEntry('dockerImage', 'node:lts-bookworm')) assertThat(dockerExecuteRule.dockerParams.stashContent, hasItem('buildDescriptor')) assertThat(dockerExecuteRule.dockerParams.stashContent, hasItem('opensourceConfiguration')) }