From 8c52e4c044e90ab060d40facacca632c1c91de08 Mon Sep 17 00:00:00 2001 From: Cheryl King Date: Mon, 15 Jul 2024 17:15:29 -0500 Subject: [PATCH 1/3] Update messages and docs related to running tests when skipTests is set to true --- .github/workflows/maven.yml | 5 +++-- docs/dev.md | 2 +- liberty-maven-plugin/pom.xml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ee3ae9504..c7e18fd98 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -48,7 +48,8 @@ jobs: - name: Checkout ci.common uses: actions/checkout@v3 with: - repository: OpenLiberty/ci.common + repository: cherylking/ci.common + ref: skipTestsChanges path: ci.common - name: Checkout ci.ant uses: actions/checkout@v3 @@ -102,7 +103,7 @@ jobs: - name: Clone ci.ant, ci.common, ci.maven repos to C drive run: | cp -r D:/a/ci.maven/ci.maven C:/ci.maven - git clone https://github.com/OpenLiberty/ci.common.git C:/ci.common + git clone https://github.com/cherylking/ci.common.git --branch skipTestsChanges --single-branch C:/ci.common git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant - name: Set up Maven uses: stCarolas/setup-maven@v4.5 diff --git a/docs/dev.md b/docs/dev.md index a4f79e306..d234b6497 100644 --- a/docs/dev.md +++ b/docs/dev.md @@ -98,7 +98,7 @@ The following are the parameters supported by this goal in addition to the [comm | Parameter | Description | Required | | -------- | ----------- | ------- | | hotTests | If set to `true`, run unit and integration tests automatically after every change. The default value is `false`. | No | -| skipTests | If set to `true`, do not run any tests in dev mode. The default value is `false`. | No | +| skipTests | If this option is enabled, do not run any tests in dev mode, even when the `Enter` key is pressed or when `hotTests` is set to `true`. The default value is `false`. | No | | skipUTs | If set to `true`, skip unit tests. The default value is `false`. If the project packaging type is `ear`, unit tests are always skipped. | No | | skipITs | If set to `true`, skip integration tests. The default value is `false`. | No | | debug | Whether to allow attaching a debugger to the running server. The default value is `true`. | No | diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml index 41b7a0149..0dbb48850 100644 --- a/liberty-maven-plugin/pom.xml +++ b/liberty-maven-plugin/pom.xml @@ -88,7 +88,7 @@ io.openliberty.tools ci.common - 1.8.33 + 1.8.34-SNAPSHOT org.twdata.maven From 52e8393133ca26a23362d5b5a3c6a8848a12dbcf Mon Sep 17 00:00:00 2001 From: Cheryl King Date: Mon, 15 Jul 2024 19:55:21 -0500 Subject: [PATCH 2/3] exclude verify-user-feature-it for now --- .github/workflows/maven.yml | 4 ++-- liberty-maven-plugin/pom.xml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c7e18fd98..79bf2b809 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,7 +22,7 @@ jobs: matrix: # test against latest update of each major Java version, as well as specific updates of LTS versions: RUNTIME: [ol, wlp] - RUNTIME_VERSION: [24.0.0.3] + RUNTIME_VERSION: [24.0.0.6] java: [21, 17, 11, 8] exclude: - java: 8 @@ -81,7 +81,7 @@ jobs: matrix: # test against latest update of each major Java version, as well as specific updates of LTS versions: RUNTIME: [ol, wlp] - RUNTIME_VERSION: [24.0.0.3] + RUNTIME_VERSION: [24.0.0.6] java: [21, 17, 11, 8] exclude: - java: 8 diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml index 0dbb48850..a2073905f 100644 --- a/liberty-maven-plugin/pom.xml +++ b/liberty-maven-plugin/pom.xml @@ -226,6 +226,7 @@ springboot-3-tests/pom.xml dev-container-it/pom.xml compile-jsp-source-17-it/pom.xml + verify-user-feature-it/pom.xml @@ -268,6 +269,7 @@ springboot-3-tests/pom.xml dev-container-it/pom.xml compile-jsp-source-17-it/pom.xml + verify-user-feature-it/pom.xml @@ -309,6 +311,7 @@ binary-scanner-it/pom.xml springboot-3-tests/pom.xml compile-jsp-source-17-it/pom.xml + verify-user-feature-it/pom.xml @@ -355,6 +358,7 @@ binary-scanner-it/pom.xml springboot-3-tests/pom.xml compile-jsp-source-17-it/pom.xml + verify-user-feature-it/pom.xml From 9d4cd9bff25c1621d6e36ce3ed47de0ccf498714 Mon Sep 17 00:00:00 2001 From: Cheryl King Date: Tue, 16 Jul 2024 21:18:55 -0500 Subject: [PATCH 3/3] undo yaml and pom changes --- .github/workflows/maven.yml | 5 ++--- liberty-maven-plugin/pom.xml | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 79bf2b809..c15afc6d2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -48,8 +48,7 @@ jobs: - name: Checkout ci.common uses: actions/checkout@v3 with: - repository: cherylking/ci.common - ref: skipTestsChanges + repository: OpenLiberty/ci.common path: ci.common - name: Checkout ci.ant uses: actions/checkout@v3 @@ -103,7 +102,7 @@ jobs: - name: Clone ci.ant, ci.common, ci.maven repos to C drive run: | cp -r D:/a/ci.maven/ci.maven C:/ci.maven - git clone https://github.com/cherylking/ci.common.git --branch skipTestsChanges --single-branch C:/ci.common + git clone https://github.com/OpenLiberty/ci.common.git C:/ci.common git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant - name: Set up Maven uses: stCarolas/setup-maven@v4.5 diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml index a2073905f..0dbb48850 100644 --- a/liberty-maven-plugin/pom.xml +++ b/liberty-maven-plugin/pom.xml @@ -226,7 +226,6 @@ springboot-3-tests/pom.xml dev-container-it/pom.xml compile-jsp-source-17-it/pom.xml - verify-user-feature-it/pom.xml @@ -269,7 +268,6 @@ springboot-3-tests/pom.xml dev-container-it/pom.xml compile-jsp-source-17-it/pom.xml - verify-user-feature-it/pom.xml @@ -311,7 +309,6 @@ binary-scanner-it/pom.xml springboot-3-tests/pom.xml compile-jsp-source-17-it/pom.xml - verify-user-feature-it/pom.xml @@ -358,7 +355,6 @@ binary-scanner-it/pom.xml springboot-3-tests/pom.xml compile-jsp-source-17-it/pom.xml - verify-user-feature-it/pom.xml