ensure ecu.test 2024.4 compatibility (#206)

jenkinsci · Dec 19, 2024 · 7324531 · 7324531
1 parent 47d34e4
commit 7324531
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/Jenkinsfile.internal b/Jenkinsfile.internal
@@ -47,7 +47,7 @@ pipeline {
         string(name: 'CONTAINER_TEST_DATA_BRANCH', defaultValue: 'main', description: 'The specified branch name to use for testing.')
         string(name: 'ET_VERSION', defaultValue: '2023.4.0', description: 'The specified ecu.test version to use for testing.')
         string(name: 'ET_V1_VERSION', defaultValue: '2023.3.0', description: 'The specified ecu.test v1 version to use for testing.')
-        string(name: 'ET_V2_VERSION', defaultValue: '2024.3.0_RC', description: 'The specified ecu.test v2 version to use for testing.')
+        string(name: 'ET_V2_VERSION', defaultValue: '2024.4.0', description: 'The specified ecu.test v2 version to use for testing.')
         string(name: 'TG_VERSION', defaultValue: '1.180.0', description: 'The specified test.guide version to use for testing.')
     }
 

diff --git a/README.md b/README.md
@@ -143,16 +143,17 @@ create an [issue](#contribution).
     <summary><a href="https://www.tracetronic.com/products/ecu-test">ecu.test</a>/
     <a href="https://www.tracetronic.com/products/trace-check/">trace.check</a> compat matrix (min 2022.4) </summary>
 
-| Version |    latest - 3.5    |     3.4 - 3.1      |        3.0         |
-|---------|:------------------:|:------------------:|:------------------:|
-| 2024.3  | :heavy_check_mark: |        :x:         |        :x:         |
-| 2024.2  | :heavy_check_mark: |        :x:         |        :x:         |
-| 2024.1  | :heavy_check_mark: | :heavy_check_mark: |        :x:         |
-| 2023.4  | :heavy_check_mark: | :heavy_check_mark: |        :x:         |
-| 2023.3  | :heavy_check_mark: | :heavy_check_mark: |        :x:         |
-| 2023.2  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| 2023.1  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| 2022.4  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Version |    latest - 3.7    |     3.6 - 3.5      |     3.4 - 3.1      |        3.0         |
+|---------|:------------------:|:------------------:|:------------------:|:------------------:|
+| 2024.4  | :heavy_check_mark: |        :x:         |        :x:         |        :x:         |
+| 2024.3  | :heavy_check_mark: | :heavy_check_mark: |        :x:         |        :x:         |
+| 2024.2  | :heavy_check_mark: | :heavy_check_mark: |        :x:         |        :x:         |
+| 2024.1  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |        :x:         |
+| 2023.4  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |        :x:         |
+| 2023.3  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |        :x:         |
+| 2023.2  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| 2023.1  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| 2022.4  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 
 :warning: Please note that compatibility for trace.check is only warranted for __Windows__ OS.
 
@@ -162,6 +163,7 @@ create an [issue](#contribution).
 
 | Version | latest - 3.6       |     3.5 - 3.0      |
 |---------|--------------------|:------------------:|
+| 1.180.0 | :heavy_check_mark: | :heavy_check_mark: |
 | 1.178.0 | :heavy_check_mark: | :heavy_check_mark: |
 | 1.147.0 | :x:                | :heavy_check_mark: |
 | 1.142.0 | :x:                | :heavy_check_mark: |

diff --git a/build.gradle b/build.gradle
@@ -371,7 +371,6 @@ cyclonedxBom {
 
 dependencyCheck {
     autoUpdate = false
-    cveValidForHours = 24
     formats = ['HTML', 'JSON']
     failBuildOnCVSS = Float.parseFloat(project.properties['failBuildOnCVSS']) // only "HIGH" and "CRITICAL" vulnerabilities
     suppressionFile = 'config/vulnerabilities/suppressionFile.xml'

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ openapiVersion=7.0.1
 spotBugsPlugin=6.0.18
 spotBugsVersion=4.7.3
 cyclonedxVersion=1.7.4
-depCheckVersion=7.4.1
+depCheckVersion=11.1.1
 failBuildOnCVSS=9.0
 javaVersion=17
 # --- Disabling SHA256 and SHA512 checksums when releasing a plugin ---#

diff --git a/src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/StartToolStep.groovy b/src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/StartToolStep.groovy
@@ -235,8 +235,7 @@ class StartToolStep extends Step {
         private void checkLicense(String toolName) {
             ArgumentListBuilder args = new ArgumentListBuilder()
             args.add(installation.exeFileOnNode.absolutePath)
-            args.add("--startupAutomated=True")
-            args.add("-q")
+            args.add("--license")
             Process process = new ProcessBuilder().command(args.toCommandArray()).start()
 
             Callable<Integer> call = new Callable<Integer>() {

diff --git a/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/ETContainerTest.groovy b/src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/ETContainerTest.groovy
@@ -91,7 +91,8 @@ abstract class ETContainerTest extends ContainerTest {
         then: "expect error"
             jenkins.assertLogContains("Executing package checks for 'invalid_package_desc.pkg'", run)
             jenkins.assertLogContains("-> result: ERROR", run)
-            jenkins.assertLogContains("--> invalid_package_desc.pkg:  Description must not be empty!", run)
+            jenkins.assertLogContains("--> invalid_package_desc.pkg:", run)
+            jenkins.assertLogContains("Description must not be empty!",run)
     }
 
     def "Perform check with timeout"() {
@@ -154,7 +155,8 @@ abstract class ETContainerTest extends ContainerTest {
         then: "expect error"
             jenkins.assertLogContains("Executing package checks for 'invalid_package_desc.prj'", run)
             jenkins.assertLogContains("-> result: ERROR", run)
-            jenkins.assertLogContains("--> invalid_package_desc.pkg:  Description must not be empty!", run)
+            jenkins.assertLogContains("--> invalid_package_desc.pkg:", run)
+            jenkins.assertLogContains("Description must not be empty!",run)
     }
 
     def "Execute test case"() {
@@ -228,7 +230,8 @@ abstract class ETContainerTest extends ContainerTest {
         then: "expect successful test completion"
             jenkins.assertLogContains("Executing package checks for 'invalid_package_desc.pkg'", run)
             jenkins.assertLogContains("-> result: ERROR", run)
-            jenkins.assertLogContains("--> invalid_package_desc.pkg:  Description must not be empty!", run)
+            jenkins.assertLogContains("--> invalid_package_desc.pkg:", run)
+            jenkins.assertLogContains("Description must not be empty!",run)
             jenkins.assertLogContains("Executing package 'invalid_package_desc.pkg'", run)
             jenkins.assertLogContains("-> result: SUCCESS", run)
             jenkins.assertLogContains("-> reportDir: ${ET_WS_PATH}/TestReports/invalid_package_desc_", run)