From de5025ea54f4f779f03ec8c84e0efe7b17232718 Mon Sep 17 00:00:00 2001 From: Petr Khartskhaev Date: Tue, 25 Nov 2025 15:21:23 +0100 Subject: [PATCH 1/2] Tests use reusable workflows from ci-actions --- .github/workflows/container-tests.yml | 78 ++++--------------------- .github/workflows/openshift-pytests.yml | 41 ------------- .github/workflows/openshift-tests.yml | 60 ------------------- 3 files changed, 10 insertions(+), 169 deletions(-) delete mode 100644 .github/workflows/openshift-pytests.yml delete mode 100644 .github/workflows/openshift-tests.yml diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml index bd72fffd..9f65fb13 100644 --- a/.github/workflows/container-tests.yml +++ b/.github/workflows/container-tests.yml @@ -4,72 +4,14 @@ on: - created jobs: distgen-check: - name: "Check distgen generated files" - runs-on: ubuntu-latest - concurrency: - group: container-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }} - cancel-in-progress: true - if: | - github.event.issue.pull_request - && (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]')) - && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association) - steps: - - name: Checkout repo - uses: actions/checkout@v5 - with: - ref: "refs/pull/${{ github.event.issue.number }}/head" - submodules: true - - - name: Check distgen generated files - id: check - shell: bash - run: | - sha=$(git rev-parse HEAD) - sudo apt update && sudo apt -y install python3-pip - pip3 install distgen - result="success" - ./common/tests/check_distgen_generated_files.sh || result="failure" - echo "result=$result" >> "$GITHUB_OUTPUT" - echo "sha=$sha" >> "$GITHUB_OUTPUT" - - - name: Set final commit status - uses: myrotvorets/set-commit-status-action@v2.0.0 - with: - status: ${{ steps.check.outputs.result }} - context: "Distgen check" - sha: ${{ steps.check.outputs.sha }} - - - name: Exit on ERR - shell: bash - run: | - _result=${{ steps.check.outputs.result }} - if [ "$_result" == failure ]; then - echo "::error::Distgen-generated files are not regenerated properly." - echo "::warning::Please regenerate them with:" - echo "::warning::'make clean-versions'" - echo "::warning::'make generate-all'" - exit 1 - fi + uses: "sclorg/ci-actions/.github/workflows/distgen-check.yml@main" + check-readme: + uses: "sclorg/ci-actions/.github/workflows/check-readme.yml@main" container-tests: - needs: distgen-check - runs-on: ubuntu-latest - name: "Container tests: ${{ matrix.version }} - ${{ matrix.os_test }}" - strategy: - fail-fast: false - matrix: - version: [ "11", "12", "13", "14", "15", "16" ] - os_test: [ "fedora", "rhel8", "rhel9", "rhel10", "c9s", "c10s" ] - test_case: [ "container" ] - - if: | - github.event.issue.pull_request - && (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]')) - && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association) - steps: - - uses: sclorg/tfaga-wrapper@main - with: - os_test: ${{ matrix.os_test }} - version: ${{ matrix.version }} - test_case: ${{ matrix.test_case }} - public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }} - private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }} + needs: check-readme + uses: "sclorg/ci-actions/.github/workflows/container-tests.yml@main" + with: + enabled-tests: '["container","openshift-4","openshift-pytest"]' + versions: '[ "12", "13", "15", "16" ]' + openshift-versions: '[ "12", "13", "15", "16" ]' + secrets: inherit diff --git a/.github/workflows/openshift-pytests.yml b/.github/workflows/openshift-pytests.yml deleted file mode 100644 index a6da8e63..00000000 --- a/.github/workflows/openshift-pytests.yml +++ /dev/null @@ -1,41 +0,0 @@ -on: - issue_comment: - types: - - created -jobs: - check-imagestreams: - runs-on: ubuntu-latest - permissions: - contents: read - statuses: write - if: | - github.event.issue.pull_request - && (contains(github.event.comment.body, '[test-openshift-pytest]') || contains(github.event.comment.body, '[test-all]')) - && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association) - steps: - - uses: sclorg/ci-scripts/ocp-stream-generator@master - with: - ref: "refs/pull/${{ github.event.issue.number }}/head" - - openshift-pytests: - name: "${{ matrix.test_case }} PyTests: ${{ matrix.version }} - ${{ matrix.os_test }}" - runs-on: ubuntu-latest - needs: check-imagestreams - concurrency: - group: ocp-pytest-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }} - cancel-in-progress: true - strategy: - fail-fast: false - matrix: - version: [ "12", "13", "14", "15", "16" ] - os_test: [ "rhel8", "rhel9", "rhel10"] - test_case: [ "openshift-pytest" ] - - steps: - - uses: sclorg/tfaga-wrapper@main - with: - os_test: ${{ matrix.os_test }} - version: ${{ matrix.version }} - test_case: ${{ matrix.test_case }} - public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }} - private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }} diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml deleted file mode 100644 index a96a23c7..00000000 --- a/.github/workflows/openshift-tests.yml +++ /dev/null @@ -1,60 +0,0 @@ -on: - issue_comment: - types: - - created -jobs: - check-imagestreams: - runs-on: ubuntu-latest - permissions: - contents: read - statuses: write - if: | - github.event.issue.pull_request - && (contains(github.event.comment.body, '[test-openshift]') || contains(github.event.comment.body, '[test-all]')) - && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association) - steps: - - uses: sclorg/ci-scripts/ocp-stream-generator@master - with: - ref: "refs/pull/${{ github.event.issue.number }}/head" - - distgen-check: - name: "Check distgen generated files" - runs-on: ubuntu-latest - needs: check-imagestreams - steps: - - name: Checkout repo - uses: actions/checkout@v5 - with: - ref: "refs/pull/${{ github.event.issue.number }}/head" - submodules: true - - - name: Check distgen generated files - id: check - shell: bash - run: | - sudo apt update && sudo apt -y install python3-pip - pip3 install distgen - result="success" - ./common/tests/check_distgen_generated_files.sh - - openshift-tests: - needs: distgen-check - name: "${{ matrix.test_case }} tests: ${{ matrix.version }} - ${{ matrix.os_test }}" - runs-on: ubuntu-latest - concurrency: - group: ocp-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }} - cancel-in-progress: true - strategy: - fail-fast: false - matrix: - version: [ "11", "12", "13", "15", "16" ] - os_test: [ "rhel8", "rhel9", "rhel10" ] - test_case: [ "openshift-4" ] - steps: - - uses: sclorg/tfaga-wrapper@main - with: - os_test: ${{ matrix.os_test }} - version: ${{ matrix.version }} - test_case: ${{ matrix.test_case }} - public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }} - private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }} From b563838d0fe4ae934d1c47139943bc4ae3195097 Mon Sep 17 00:00:00 2001 From: Petr Khartskhaev Date: Tue, 25 Nov 2025 15:21:35 +0100 Subject: [PATCH 2/2] Add version table in main README.md --- README.md | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 7d9f8a81..8966e5a8 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,6 @@ [![Build and push images to Quay.io registry](https://github.com/sclorg/postgresql-container/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/sclorg/postgresql-container/actions/workflows/build-and-push.yml) -Images available on Quay.io are: - -- CentOS Stream 9 [postgresql-13](https://quay.io/repository/sclorg/postgresql-13-c9s) -- CentOS Stream 9 [postgresql-15](https://quay.io/repository/sclorg/postgresql-15-c9s) -- CentOS Stream 9 [postgresql-16](https://quay.io/repository/sclorg/postgresql-16-c9s) -- CentOS Stream 10 [postgresql-16](https://quay.io/repository/sclorg/postgresql-16-c10s) -- Fedora [postgresql-15](https://quay.io/repository/fedora/postgresql-15) -- Fedora [postgresql-16](https://quay.io/repository/fedora/postgresql-16) - This repository provides Dockerfiles for PostgreSQL container images, optimized for use with OpenShift. These images are available in RHEL, Fedora, and CentOS-based variants. For more information about using these images with OpenShift, please refer to the official [OpenShift Documentation](https://docs.okd.io/latest/openshift_images/using-templates.html). @@ -19,22 +10,19 @@ To contribute to this project, please review [the Contribution Guidelines](https For learning more information about concepts used in these container images, see the [Landing page](https://github.com/sclorg/welcome). ## Versions - -PostgreSQL versions currently supported are: - -- [postgresql-12](https://github.com/sclorg/postgresql-container/tree/master/12) -- [postgresql-13](https://github.com/sclorg/postgresql-container/tree/master/13) -- [postgresql-15](https://github.com/sclorg/postgresql-container/tree/master/15) -- [postgresql-16](https://github.com/sclorg/postgresql-container/tree/master/16) - -RHEL versions currently supported are: -- RHEL8 -- RHEL9 -- RHEL10 - -CentOS Stream versions currently supported are: -- CentOS Stream 9 -- CentOS Stream 10 +Currently supported versions are visible in the following table, expand an entry to see its container registry address. + +||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10| +|:--|:--:|:--:|:--:|:--:|:--:|:--:| +|12||||
✓`registry.redhat.io/rhel8/postgresql-12`
||| +|13|
✓`quay.io/sclorg/postgresql-13-c9s`
|||
✓`registry.redhat.io/rhel8/postgresql-13`
|
✓`registry.redhat.io/rhel9/postgresql-13`
|| +|15|
✓`quay.io/sclorg/postgresql-15-c9s`
||
✓`quay.io/fedora/postgresql-15`
|
✓`registry.redhat.io/rhel8/postgresql-15`
|
✓`registry.redhat.io/rhel9/postgresql-15`
|| +|16|
✓`quay.io/sclorg/postgresql-16-c9s`
|
✓`quay.io/sclorg/postgresql-16-c10s`
|
✓`quay.io/fedora/postgresql-16`
|
✓`registry.redhat.io/rhel8/postgresql-16`
|
✓`registry.redhat.io/rhel9/postgresql-16`
|
✓`registry.redhat.io/rhel10/postgresql-16`
| + ## Installation