From ad735b487e6c71fe94e2c3e5d9dfa6981d32556f Mon Sep 17 00:00:00 2001 From: Petr Khartskhaev Date: Tue, 18 Nov 2025 16:33:56 +0100 Subject: [PATCH 1/2] Tests use reusable workflows from ci-actions --- .github/workflows/container-pytests.yml | 30 ------------------ .github/workflows/container-tests.yml | 32 ++++++------------- .github/workflows/openshift-pytests.yml | 41 ------------------------- .github/workflows/openshift-tests.yml | 41 ------------------------- 4 files changed, 9 insertions(+), 135 deletions(-) delete mode 100644 .github/workflows/container-pytests.yml delete mode 100644 .github/workflows/openshift-pytests.yml delete mode 100644 .github/workflows/openshift-tests.yml diff --git a/.github/workflows/container-pytests.yml b/.github/workflows/container-pytests.yml deleted file mode 100644 index 46dfbef6..00000000 --- a/.github/workflows/container-pytests.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: [ "2.4", "2.4-micro" ] - 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 54e21137..e06ac5d1 100644 --- a/.github/workflows/container-tests.yml +++ b/.github/workflows/container-tests.yml @@ -3,28 +3,14 @@ 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: [ "2.4", "2.4-micro" ] - os_test: [ "fedora", "rhel8", "rhel9", "rhel10", "c9s", "c10s" ] - test_case: [ "container" ] + needs: check-readme + uses: "sclorg/ci-actions/.github/workflows/container-tests.yml@main" + with: + enabled-tests: '["container","container-pytest","openshift-4","openshift-pytest"]' + versions: '["2.4", "2.4-micro"]' + openshift-versions: '["2.4"]' + secrets: inherit - 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 }} diff --git a/.github/workflows/openshift-pytests.yml b/.github/workflows/openshift-pytests.yml deleted file mode 100644 index 9e4a0092..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: [ "2.4" ] - 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 0dc08326..00000000 --- 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: [ "2.4" ] - 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 c7f500dcb5820dc96faa91b271924eb48d04f9f9 Mon Sep 17 00:00:00 2001 From: Petr Khartskhaev Date: Tue, 18 Nov 2025 16:34:19 +0100 Subject: [PATCH 2/2] Add version table in main README.md --- README.md | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 48c80d30..81b625b2 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,6 @@ Apache HTTP Server Container Images [![Build and push images to Quay.io registry](https://github.com/sclorg/httpd-container/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/sclorg/httpd-container/actions/workflows/build-and-push.yml) -Images available on Quay are: -* Fedora [httpd-2.4](https://quay.io/repository/fedora/httpd-24) - This repository contains Dockerfiles for Apache HTTP Server images for OpenShift and general usage. Users can choose between RHEL and CentOS based images. @@ -17,19 +14,17 @@ For more information about concepts used in these container images, see the Versions -------- -Apache HTTPD versions currently provided are: -* [httpd-2.4](2.4) -* [httpd-2.4-micro](2.4-micro) - -RHEL versions currently supported are: -* RHEL 8 -* RHEL 9 -* RHEL 10 - -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| +|:--|:--:|:--:|:--:|:--:|:--:|:--:| +|2.4-micro|
✓`quay.io/sclorg/httpd-24-micro-c9s`
|
✓`quay.io/sclorg/httpd-24-micro-c10s`
|
✓`quay.io/fedora/httpd-24-micro`
|||| +|2.4|
✓`quay.io/sclorg/httpd-24-c9s`
|
✓`quay.io/sclorg/httpd-24-c10s`
|
✓`quay.io/fedora/httpd-24`
|
✓`registry.redhat.io/rhel8/httpd-24`
|
✓`registry.redhat.io/rhel9/httpd-24`
|
✓`registry.redhat.io/rhel10/httpd-24`
| + Installation ------------