Add support testing on RHEL9 unsubscribed host

Signed-off-by: Petr "Stone" Hracek <[email protected]>
sclorg · Jul 27, 2022 · 3d0ca0e · 3d0ca0e
1 parent 5fe67e2
commit 3d0ca0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
@@ -51,6 +51,14 @@ jobs:
             branch: "master"
             tmt_repo: "https://gitlab.cee.redhat.com/platform-eng-core-services/sclorg-tmt-plans"
             tf_scope: "private"
+          - tmt_plan: "rhel9-unsubscribed-docker"
+            os_test: "rhel9"
+            context: "RHEL9 - Unsubscribed host"
+            compose: "RHEL-9.0.0-Nightly"
+            api_key: "TF_INTERNAL_API_KEY"
+            branch: "master"
+            tmt_repo: "https://gitlab.cee.redhat.com/platform-eng-core-services/sclorg-tmt-plans"
+            tf_scope: "private"
           - tmt_plan: "c9s"
             os_test: "c9s"
             context: "CentOS Stream 9"

diff --git a/2.4/Dockerfile.rhel8 b/2.4/Dockerfile.rhel8
@@ -25,7 +25,7 @@ LABEL summary="$SUMMARY" \
       io.openshift.tags="builder,httpd,httpd-24" \
       name="rhel8/httpd-24" \
       version="1" \
-      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
       com.redhat.component="httpd-24-container" \
       usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ rhel8/httpd-24 sample-server" \
       maintainer="SoftwareCollections.org <[email protected]>"

diff --git a/2.4/Dockerfile.rhel9 b/2.4/Dockerfile.rhel9
@@ -25,7 +25,7 @@ LABEL summary="$SUMMARY" \
       io.openshift.tags="builder,httpd,httpd-24" \
       name="rhel9/httpd-24" \
       version="1" \
-      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
       com.redhat.component="httpd-24-container" \
       usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ rhel9/httpd-24 sample-server" \
       maintainer="SoftwareCollections.org <[email protected]>"