Fix and enhance Behave GC tests

The Behave GC tests were broken by changes to (unrelated)
JAVA_MAX_MEM_RATIO. The tests are too sensitive because they check
the context around the arguments they are concerned about and are
sensitive to ordering.

Re-work the tests to only check for the parameter they are testing.
Whilst we're at it, re-work them to not require S2I, either, and
re-tag them to run on the runtime images too, now that they can.

This should also reduce the time required to check them.

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

tests/features/java/gc.feature

@@ -1,71 +1,64 @@
 @openjdk
-@ubi8/openjdk-8
-@ubi8/openjdk-11
-@ubi8/openjdk-17
 @redhat-openjdk-18
+@ubi8
 Feature: Openshift OpenJDK GC tests
 
   Scenario: Check default GC configuration
-    Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
-    Then s2i build log should contain Using MAVEN_OPTS -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90
-    And container log should contain -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90
+    Given container is started as uid 1000
+    Then container log should contain -XX:+UseParallelGC
+    And  container log should contain -XX:MinHeapFreeRatio=10
+    And  container log should contain -XX:MaxHeapFreeRatio=20
+    And  container log should contain -XX:GCTimeRatio=4
 
   Scenario: Check GC_MIN_HEAP_FREE_RATIO GC configuration
-    Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
+    Given container is started with env
        | variable                         | value  |
        | GC_MIN_HEAP_FREE_RATIO           | 5      |
-    Then s2i build log should contain Using MAVEN_OPTS -XX:+UseParallelGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90
-    And container log should contain -XX:+UseParallelGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90
+    Then container log should contain -XX:MinHeapFreeRatio=5
 
   Scenario: Check GC_MAX_HEAP_FREE_RATIO GC configuration
-    Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
+    Given container is started with env
        | variable                         | value  |
        | GC_MAX_HEAP_FREE_RATIO           | 50     |
-    Then s2i build log should contain Using MAVEN_OPTS -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90
-    And container log should contain -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90
+    Then container log should contain -XX:MaxHeapFreeRatio=50
 
   Scenario: Check GC_TIME_RATIO GC configuration
-    Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
+    Given container is started with env
        | variable                         | value  |
        | GC_TIME_RATIO                    | 5      |
-    Then s2i build log should contain Using MAVEN_OPTS -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=5 -XX:AdaptiveSizePolicyWeight=90
-    And container log should contain -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=5 -XX:AdaptiveSizePolicyWeight=90
+    Then container log should contain -XX:GCTimeRatio=5
 
   Scenario: Check GC_ADAPTIVE_SIZE_POLICY_WEIGHT GC configuration
-    Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
+    Given container is started with env
        | variable                         | value  |
        | GC_ADAPTIVE_SIZE_POLICY_WEIGHT   | 80     |
-    Then s2i build log should contain Using MAVEN_OPTS -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=80
-    And container log should contain -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=80
+    Then container log should contain -XX:AdaptiveSizePolicyWeight=80
 
   Scenario: Check GC_MAX_METASPACE_SIZE GC configuration
-    Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
+    Given container is started with env
        | variable                 | value  |
        | GC_MAX_METASPACE_SIZE    | 120    |
-    Then s2i build log should contain Using MAVEN_OPTS -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=120m
-    And container log should contain -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=120m
+    Then container log should contain -XX:MaxMetaspaceSize=120m
 
   Scenario: Check GC_CONTAINER_OPTIONS configuration
-    Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
+    Given container is started with env
        | variable             | value        |
        | GC_CONTAINER_OPTIONS | -XX:+UseG1GC |
-    Then s2i build log should contain Using MAVEN_OPTS -XX:+UseG1GC
-    And container log should contain -XX:+UseG1GC
+    Then container log should contain -XX:+UseG1GC
     And container log should not contain -XX:+UseParallelGC
 
   Scenario: Check GC_METASPACE_SIZE GC configuration
-    Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
-       | variable                 | value  |
+    Given container is started with env
+       | variable             | value  |
        | GC_METASPACE_SIZE    | 120    |
-    Then s2i build log should contain -XX:MetaspaceSize=120m
-    And container log should contain -XX:MetaspaceSize=120m
+    Then container log should contain -XX:MetaspaceSize=120m
     And container log should not contain integer expression expected
 
   Scenario: Check GC_METASPACE_SIZE constrained by GC_MAX_METASPACE_SIZE GC configuration
-    Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
-       | variable                 | value  |
-       | GC_METASPACE_SIZE    | 120    |
+    Given container is started with env
+       | variable                 | value |
+       | GC_METASPACE_SIZE        | 120   |
        | GC_MAX_METASPACE_SIZE    | 90    |
-    Then s2i build log should contain -XX:MaxMetaspaceSize=90m -XX:MetaspaceSize=90m
-    And container log should contain -XX:MaxMetaspaceSize=90m -XX:MetaspaceSize=90m
+    Then container log should contain -XX:MaxMetaspaceSize=90m
+    And  container log should contain -XX:MetaspaceSize=90m