From 4fdb31175722e230f8ac0e3943a7536f26c51138 Mon Sep 17 00:00:00 2001 From: Jayashree Huttanagoudar Date: Fri, 15 Mar 2024 23:14:28 +0530 Subject: [PATCH 1/2] Split the tests inside openjdk_s2i.feature to couple them with appropriate modules Signed-off-by: Jayashree Huttanagoudar --- modules/jvm/api/tests/features/performance.feature | 14 ++++++++++++++ .../api/tests/features/java_s2i_quarkus.feature | 11 +---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 modules/jvm/api/tests/features/performance.feature rename tests/features/java/openjdk_s2i.feature => modules/s2i/core/api/tests/features/java_s2i_quarkus.feature (76%) diff --git a/modules/jvm/api/tests/features/performance.feature b/modules/jvm/api/tests/features/performance.feature new file mode 100644 index 00000000..4dbbb7ae --- /dev/null +++ b/modules/jvm/api/tests/features/performance.feature @@ -0,0 +1,14 @@ +# builder only +@ubi8/openjdk-11 +@ubi8/openjdk-17 +@ubi8/openjdk-21 +Feature: JVM Performance tests + + @ubi8/openjdk-8 + # temporarily marking 'ignore' so these tests are skipped on GHA + # See: https://issues.redhat.com/browse/OPENJDK-2602 + @ignore + Scenario: Check java perf dir owned by jboss (CLOUD-2070) + Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet + Then run jstat -gc 1 1000 1 in container and check its output for S0C + And run stat --printf="%U %G" /tmp/hsperfdata_jboss/ in container and check its output for jboss root diff --git a/tests/features/java/openjdk_s2i.feature b/modules/s2i/core/api/tests/features/java_s2i_quarkus.feature similarity index 76% rename from tests/features/java/openjdk_s2i.feature rename to modules/s2i/core/api/tests/features/java_s2i_quarkus.feature index 88dd4123..0d72808f 100644 --- a/tests/features/java/openjdk_s2i.feature +++ b/modules/s2i/core/api/tests/features/java_s2i_quarkus.feature @@ -2,16 +2,7 @@ @ubi8/openjdk-11 @ubi8/openjdk-17 @ubi8/openjdk-21 -Feature: Openshift OpenJDK-only S2I tests - - @ubi8/openjdk-8 - # temporarily marking 'ignore' so these tests are skipped on GHA - # See: https://issues.redhat.com/browse/OPENJDK-2602 - @ignore - Scenario: Check java perf dir owned by jboss (CLOUD-2070) - Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet - Then run jstat -gc 1 1000 1 in container and check its output for S0C - And run stat --printf="%U %G" /tmp/hsperfdata_jboss/ in container and check its output for jboss root +Feature: Openshift OpenJDK S2I tests (Quarkus-based) Scenario: Ensure Quarkus CDS doesn't fail due to timestamp mismatch (OPENDJK-1673) Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from getting-started From c6bf13765d8cf40df273ccf4f27376eeb377c671 Mon Sep 17 00:00:00 2001 From: Jayashree Huttanagoudar Date: Tue, 19 Mar 2024 23:00:26 +0530 Subject: [PATCH 2/2] Address review comments Signed-off-by: Jayashree Huttanagoudar --- modules/jvm/api/tests/features/performance.feature | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 modules/jvm/api/tests/features/performance.feature diff --git a/modules/jvm/api/tests/features/performance.feature b/modules/jvm/api/tests/features/performance.feature deleted file mode 100644 index 4dbbb7ae..00000000 --- a/modules/jvm/api/tests/features/performance.feature +++ /dev/null @@ -1,14 +0,0 @@ -# builder only -@ubi8/openjdk-11 -@ubi8/openjdk-17 -@ubi8/openjdk-21 -Feature: JVM Performance tests - - @ubi8/openjdk-8 - # temporarily marking 'ignore' so these tests are skipped on GHA - # See: https://issues.redhat.com/browse/OPENJDK-2602 - @ignore - Scenario: Check java perf dir owned by jboss (CLOUD-2070) - Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet - Then run jstat -gc 1 1000 1 in container and check its output for S0C - And run stat --printf="%U %G" /tmp/hsperfdata_jboss/ in container and check its output for jboss root