Remove RHEL-7 building and testing. EOL in June 2024

Signed-off-by: Petr "Stone" Hracek <[email protected]>
sclorg · Jul 3, 2024 · 6ed1761 · 6ed1761
1 parent 93bcfd7
commit 6ed1761
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 84 deletions.
diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         version: [ "5.26", "5.26-mod_fcgid", "5.30", "5.32", "5.34", "5.36", "5.38" ]
-        os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s" ]
+        os_test: [ "fedora", "rhel8", "rhel9", "c9s" ]
         test_case: [ "container" ]
 
     if: |

diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml
@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         version: [ "5.26", "5.26-mod_fcgid", "5.30", "5.32", "5.34", "5.36", "5.38" ]
-        os_test: [ "rhel7", "rhel8", "rhel9"]
+        os_test: [ "rhel8", "rhel9"]
         test_case: [ "openshift-4" ]
 
     steps:

diff --git a/5.30/.exclude-rhel7 b/5.30/.exclude-rhel7
diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml
@@ -11,25 +11,15 @@
   - filename: perl-centos.json
     latest: "5.32-ubi8"
     distros:
-      - name: UBI 7
-        app_versions: ["5.30"]
-
       - name: UBI 8
         app_versions: ["5.26", "5.32"]
 
       - name: UBI 9
         app_versions: ["5.32"]
-    custom_tags:
-      - name: "5.30"
-        distro: UBI 7
-        app_version: ["5.30"]
 
   - filename: perl-rhel.json
     latest: "5.32-ubi8"
     distros:
-      - name: UBI 7
-        app_versions: ["5.30"]
-
       - name: UBI 8
         app_versions: ["5.26", "5.32"]
 

diff --git a/imagestreams/perl-centos.json b/imagestreams/perl-centos.json
@@ -9,25 +9,6 @@
   },
   "spec": {
     "tags": [
-      {
-        "name": "5.30-ubi7",
-        "annotations": {
-          "openshift.io/display-name": "Perl 5.30 (UBI 7)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Build and run Perl 5.30 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.",
-          "iconClass": "icon-perl",
-          "tags": "builder,perl",
-          "version": "5.30",
-          "sampleRepo": "https://github.com/sclorg/dancer-ex.git"
-        },
-        "from": {
-          "kind": "DockerImage",
-          "name": "registry.access.redhat.com/ubi7/perl-530:latest"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
       {
         "name": "5.26-ubi8",
         "annotations": {
@@ -85,25 +66,6 @@
           "type": "Local"
         }
       },
-      {
-        "name": "5.30",
-        "annotations": {
-          "openshift.io/display-name": "Perl ['5.30'] (UBI 7)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Build and run Perl ['5.30'] applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/['5.30']/README.md.",
-          "iconClass": "icon-perl",
-          "tags": "builder,perl",
-          "version": "['5.30']",
-          "sampleRepo": "https://github.com/sclorg/dancer-ex.git"
-        },
-        "from": {
-          "kind": "DockerImage",
-          "name": "registry.access.redhat.com/ubi7/perl-['530']:latest"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
       {
         "name": "latest",
         "annotations": {

diff --git a/imagestreams/perl-rhel.json b/imagestreams/perl-rhel.json
@@ -9,25 +9,6 @@
   },
   "spec": {
     "tags": [
-      {
-        "name": "5.30-ubi7",
-        "annotations": {
-          "openshift.io/display-name": "Perl 5.30 (UBI 7)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Build and run Perl 5.30 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.",
-          "iconClass": "icon-perl",
-          "tags": "builder,perl",
-          "version": "5.30",
-          "sampleRepo": "https://github.com/sclorg/dancer-ex.git"
-        },
-        "from": {
-          "kind": "DockerImage",
-          "name": "registry.redhat.io/ubi7/perl-530:latest"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
       {
         "name": "5.26-ubi8",
         "annotations": {

diff --git a/test/run b/test/run
@@ -6,7 +6,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME-centos/perl-530-centos7-candidate}
+IMAGE_NAME=${IMAGE_NAME-sclorg/perl-532-c9s}
 
 # TODO: Make command compatible for Mac users
 test_dir="$(readlink -f $(dirname "${BASH_SOURCE[0]}"))"
@@ -19,7 +19,6 @@ test_psgi_variables
 test_warningonstderr
 test_npm
 test_from_dockerfile
-test_scl_variables_in_dockerfile
 "
 
 source "${test_dir}/test-lib.sh"
@@ -289,18 +288,6 @@ test_npm() {
     cleanup
 }
 
-function test_scl_variables_in_dockerfile() {
-  if [ "$OS" == "rhel7" ] || [ "$OS" == "centos7" ]; then
-    info "Testing variable presence during \`docker exec\`"
-    ct_check_exec_env_vars
-    ct_check_testcase_result $?
-
-    info "Checking if all scl variables are defined in Dockerfile"
-    ct_check_scl_enable_vars
-    ct_check_testcase_result $?
-  fi
-}
-
 function test_from_dockerfile(){
   info "Check building using a Dockerfile"
   ct_test_app_dockerfile $test_dir/examples/from-dockerfile/${VERSION}/Dockerfile 'https://github.com/sclorg/dancer-ex.git' 'Welcome to your Dancer application' app-src

diff --git a/test/run-modfcgid b/test/run-modfcgid
@@ -6,7 +6,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME-centos/perl-530-centos7-candidate}
+IMAGE_NAME=${IMAGE_NAME-sclorg/perl-532-c9s}
 
 # TODO: Make command compatible for Mac users
 test_dir="$(readlink -f $(dirname "${BASH_SOURCE[0]}"))"