Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ensure ecu.test 2024.4 compatibility (#206) #207

Merged
merged 5 commits into from
Dec 19, 2024
Merged

ensure ecu.test 2024.4 compatibility (#206) #207

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d9be14
ensure ecu.test 2024.4 compatibility (#206)
MxEh-TT Dec 9, 2024
3d3832b
adjust to different v1, v2 responses (#206)
MxEh-TT Dec 10, 2024
ef1e0b5
adjust checkLicense (#206)
MxEh-TT Dec 16, 2024
b249a58
adjust compat matrix (#206)
MxEh-TT Dec 17, 2024
a91fe4a
update dependency check version (#206)
MxEh-TT Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile.internal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.')
}

Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ create an [issue](#contribution).

| Version | latest - 3.5 | 3.4 - 3.1 | 3.0 |
|---------|:------------------:|:------------------:|:------------------:|
| 2024.4 | :heavy_check_mark: | :x: | :x: |
ErikRehmTT marked this conversation as resolved.
Show resolved Hide resolved
| 2024.3 | :heavy_check_mark: | :x: | :x: |
| 2024.2 | :heavy_check_mark: | :x: | :x: |
| 2024.1 | :heavy_check_mark: | :heavy_check_mark: | :x: |
Expand All @@ -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: |
Expand Down
3 changes: 1 addition & 2 deletions src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/StartToolStep.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>() {
Expand Down
9 changes: 6 additions & 3 deletions src/test/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/ETContainerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"() {
Expand Down Expand Up @@ -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"() {
Expand Down Expand Up @@ -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)
Expand Down
Loading