From cde68ecaf13287862ab6c965df0e4ffa4c82c185 Mon Sep 17 00:00:00 2001 From: Petr Khartskhaev Date: Thu, 27 Nov 2025 14:22:14 +0100 Subject: [PATCH 1/2] Tests use reusable workflows from ci-actions --- .github/workflows/container-pytest.yml | 30 ------------------ .github/workflows/container-tests.yml | 33 ++++++-------------- .github/workflows/openshift-pytests.yml | 41 ------------------------- .github/workflows/openshift-tests.yml | 41 ------------------------- 4 files changed, 9 insertions(+), 136 deletions(-) delete mode 100644 .github/workflows/container-pytest.yml delete mode 100644 .github/workflows/openshift-pytests.yml delete mode 100644 .github/workflows/openshift-tests.yml diff --git a/.github/workflows/container-pytest.yml b/.github/workflows/container-pytest.yml deleted file mode 100644 index a87837723..000000000 --- a/.github/workflows/container-pytest.yml +++ /dev/null @@ -1,30 +0,0 @@ -on: - issue_comment: - types: - - created -jobs: - container-tests: - name: "Container PyTest: ${{ matrix.version }} - ${{ matrix.os_test }}" - runs-on: ubuntu-latest - concurrency: - group: container-pytest-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }} - cancel-in-progress: true - strategy: - fail-fast: false - matrix: - version: [ "7.4", "8.0", "8.2", "8.3" ] - os_test: [ "fedora", "rhel8", "rhel9", "rhel10", "c9s", "c10s"] - test_case: [ "container-pytest" ] - - if: | - github.event.issue.pull_request - && (contains(github.event.comment.body, '[test-pytest]') || 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 }} diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml index 6f6cd3fcf..95fdc08cb 100644 --- a/.github/workflows/container-tests.yml +++ b/.github/workflows/container-tests.yml @@ -3,28 +3,13 @@ on: types: - created jobs: + check-readme: + uses: "sclorg/ci-actions/.github/workflows/check-readme.yml@main" container-tests: - name: "Container tests: ${{ matrix.version }} - ${{ matrix.os_test }}" - runs-on: ubuntu-latest - concurrency: - group: container-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }} - cancel-in-progress: true - strategy: - fail-fast: false - matrix: - version: [ "7.4", "8.0", "8.2", "8.3" ] - 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","container-pytest","openshift-4","openshift-pytest"]' + versions: '[ "7.4", "8.0", "8.2", "8.3" ]' + openshift-versions: '[ "7.4", "8.0", "8.2", "8.3" ]' + secrets: inherit diff --git a/.github/workflows/openshift-pytests.yml b/.github/workflows/openshift-pytests.yml deleted file mode 100644 index 4170a41d8..000000000 --- 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: [ "7.4", "8.0", "8.2", "8.3" ] - 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 b77e171af..000000000 --- a/.github/workflows/openshift-tests.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]') || 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-tests: - name: "${{ matrix.test_case }} tests: ${{ matrix.version }} - ${{ matrix.os_test }}" - runs-on: ubuntu-latest - needs: check-imagestreams - concurrency: - group: ocp-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }} - cancel-in-progress: true - strategy: - fail-fast: false - matrix: - version: [ "7.4", "8.0", "8.2", "8.3" ] - 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 75059ca4a8def193468b8c7337d61836e04f2014 Mon Sep 17 00:00:00 2001 From: Petr Khartskhaev Date: Thu, 27 Nov 2025 14:22:35 +0100 Subject: [PATCH 2/2] Add version table in main README.md --- README.md | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index aab8668c9..493550f1c 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,6 @@ PHP Docker images [![Build and push images to Quay.io registry](https://github.com/sclorg/s2i-php-container/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/sclorg/s2i-php-container/actions/workflows/build-and-push.yml) -Images available on Quay are: -* CentOS Stream 9 [php-74](https://quay.io/repository/sclorg/php-74-c9s) -* Fedora [php-80](https://quay.io/repository/fedora/php-80) -* Fedora [php-81](https://quay.io/repository/fedora/php-81) -* Fedora [php-82](https://quay.io/repository/fedora/php-82) -* Fedora [php-83](https://quay.io/repository/fedora/php-83) - This repository contains the source for building various versions of the PHP application as a reproducible Docker image using [source-to-image](https://github.com/openshift/source-to-image). @@ -27,21 +20,19 @@ For more information about concepts used in these container images, see the Versions -------- -PHP versions currently supported are: -* [php-7.4](7.4) -* [php-8.0](8.0) -* [php-8.1](8.1) -* [php-8.2](8.2) -* [php-8.3](8.3) - -RHEL versions currently supported are: -* RHEL8 -* RHEL9 -* RHEL10 - -CenOS 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| +|:--|:--:|:--:|:--:|:--:|:--:|:--:| +|7.4||||
✓`registry.redhat.io/rhel8/php-74`
||| +|8.0|||||
✓`registry.redhat.io/rhel9/php-80`
|| +|8.2|||
✓`quay.io/fedora/php-82`
|
✓`registry.redhat.io/rhel8/php-82`
|
✓`registry.redhat.io/rhel9/php-82`
|| +|8.3|
✓`quay.io/sclorg/php-83-c9s`
|
✓`quay.io/sclorg/php-83-c10s`
|
✓`quay.io/fedora/php-83`
||
✓`registry.redhat.io/rhel9/php-83`
|
✓`registry.redhat.io/rhel10/php-83`
| + Installation ------------