Merge pull request #276 from zmiklank/stop_centos7_builds

Repository cleanup
sclorg · Aug 14, 2023 · bb97890 · bb97890
2 parents 1dc67c2 + 420bfde
commit bb97890
Show file tree

Hide file tree

Showing 76 changed files with 3 additions and 1,929 deletions.
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -14,14 +14,6 @@ jobs:
  fail-fast: false
  matrix:
  include:
- - dockerfile: "5.30/Dockerfile"
- docker_context: "5.30"
- registry_namespace: "centos7"
- tag: "centos7"
- image_name: "perl-530-centos7"
- quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
- quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
-
  - dockerfile: "5.32/Dockerfile.c9s"
  docker_context: "5.32"
  registry_namespace: "sclorg"
@@ -30,22 +22,6 @@ jobs:
  quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
  quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
 
- - dockerfile: "5.32/Dockerfile.fedora"
- docker_context: "5.32"
- registry_namespace: "fedora"
- tag: "5.32"
- image_name: "perl-532"
- quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
- quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
-
- - dockerfile: "5.34/Dockerfile.fedora"
- docker_context: "5.34"
- registry_namespace: "fedora"
- tag: "5.34"
- image_name: "perl-534"
- quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
- quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
-
  - dockerfile: "5.36/Dockerfile.fedora"
  docker_context: "5.36"
  registry_namespace: "fedora"

diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
@@ -10,7 +10,7 @@ jobs:
  fail-fast: false
  matrix:
  version: [ "5.26", "5.26-mod_fcgid", "5.30", "5.30-mod_fcgid", "5.32", "5.34", "5.36" ]
- os_test: [ "fedora", "centos7", "rhel7", "rhel8", "rhel9", "c9s" ]
+ os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s" ]
  test_case: [ "container" ]
 
  if: |

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

diff --git a/5.16/Dockerfile b/5.16/Dockerfile
diff --git a/5.16/Dockerfile.rhel7 b/5.16/Dockerfile.rhel7
diff --git a/5.16/README.md b/5.16/README.md
diff --git a/5.16/cccp.yml b/5.16/cccp.yml
diff --git a/5.16/root/opt/app-root/etc/httpd.conf b/5.16/root/opt/app-root/etc/httpd.conf
diff --git a/5.16/root/opt/app-root/etc/httpd.d/50-mpm.conf.template b/5.16/root/opt/app-root/etc/httpd.d/50-mpm.conf.template
diff --git a/5.16/root/opt/app-root/etc/httpdconf.sed b/5.16/root/opt/app-root/etc/httpdconf.sed
diff --git a/5.16/root/opt/app-root/etc/scl_enable b/5.16/root/opt/app-root/etc/scl_enable
diff --git a/5.16/s2i/bin/assemble b/5.16/s2i/bin/assemble
diff --git a/5.16/s2i/bin/run b/5.16/s2i/bin/run
diff --git a/5.16/s2i/bin/usage b/5.16/s2i/bin/usage