Update behave test label checks to check values

Don't test for 'release' or 'architecture' labels which we don't set
in our image sources anyway.

Check for strings in the values of the 'version' and 'name' labels,
to be sure we've set them and not just inherited them.

Split the label-check test into those which apply to all images,
and those which are builder-only.

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

Author: jmtd

tests/features/openshift.feature

@@ -1,11 +1,17 @@
-  # builder-only test
-@ubi8/openjdk-8
-@ubi8/openjdk-11
-@ubi8/openjdk-17
 Feature: Tests for all openshift images
 
+  @ubi8
   Scenario: Check that common labels are correctly set
     Given image is built
-    Then the image should contain label version
-    And the image should contain label name
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    # UBI base image versions are the RHEL version, e.g. "9.2", whereas all of
+    # our image versions (so far) have been 1.x
+    Then the image should contain label version containing value 1.
+    And the image should contain label name containing value openjdk
+
+  # builder-only test
+  @ubi8/openjdk-8
+  @ubi8/openjdk-11
+  @ubi8/openjdk-17
+  Scenario: Check that builder labels are correctly set
+    Given image is built
+    Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i