deprecate c8s images, as EOL for c8s is 31th of May 2024

.github/workflows/build-and-push.yml

@@ -21,83 +21,55 @@ jobs:
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             docker_context: 13
+
           - dockerfile: "15/Dockerfile.c9s"
             registry_namespace: "sclorg"
             tag: "c9s"
             image_name: "postgresql-15-c9s"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             docker_context: 15
+
           - dockerfile: "16/Dockerfile.c9s"
             registry_namespace: "sclorg"
             tag: "c9s"
             image_name: "postgresql-16-c9s"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             docker_context: 16
-          - dockerfile: "16/Dockerfile.c8s"
-            registry_namespace: "sclorg"
-            tag: "c8s"
-            image_name: "postgresql-16-c8s"
-            quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
-            quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-            docker_context: 16
-          - dockerfile: "10/Dockerfile.c8s"
-            registry_namespace: "sclorg"
-            tag: "c8s"
-            quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
-            quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-            image_name: "postgresql-10-c8s"
-            docker_context: 10
-          - dockerfile: "12/Dockerfile.c8s"
-            registry_namespace: "sclorg"
-            tag: "c8s"
-            quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
-            quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-            image_name: "postgresql-12-c8s"
-            docker_context: 12
-          - dockerfile: "13/Dockerfile.c8s"
-            registry_namespace: "sclorg"
-            tag: "c8s"
-            quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
-            quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-            image_name: "postgresql-13-c8s"
-            docker_context: 13
-          - dockerfile: "15/Dockerfile.c8s"
-            registry_namespace: "sclorg"
-            tag: "c8s"
-            quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
-            quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-            image_name: "postgresql-15-c8s"
-            docker_context: 15
+
           - dockerfile: "12/Dockerfile.fedora"
             registry_namespace: "fedora"
             tag: "12"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
             image_name: "postgresql-12"
             docker_context: 12
+
           - dockerfile: "13/Dockerfile.fedora"
             registry_namespace: "fedora"
             tag: "13"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
             image_name: "postgresql-13"
             docker_context: 13
+
           - dockerfile: "14/Dockerfile.fedora"
             registry_namespace: "fedora"
             tag: "14"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
             image_name: "postgresql-14"
             docker_context: 14
+
           - dockerfile: "15/Dockerfile.fedora"
             registry_namespace: "fedora"
             tag: "15"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
             image_name: "postgresql-15"
             docker_context: 15
+
           - dockerfile: "16/Dockerfile.fedora"
             registry_namespace: "fedora"
             tag: "16"

.github/workflows/container-tests.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   distgen-check:
     name: "Check distgen generated files"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     concurrency:
       group: container-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
       cancel-in-progress: true
@@ -52,13 +52,13 @@ jobs:
           fi
   container-tests:
     needs: distgen-check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: "Container tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
     strategy:
       fail-fast: false
       matrix:
         version: [ "10", "11", "12", "13", "14", "15", "16" ]
-        os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s", "c8s"]
+        os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s" ]
         test_case: [ "container" ]
 
     if: |