Skip to content

Commit 470c4c4

Browse files
authored
Reusable workflows and README version table (#271)
* Tests use reusable workflows from ci-actions * Add version table in main README.md
1 parent 95fe742 commit 470c4c4

File tree

5 files changed

+20
-151
lines changed

5 files changed

+20
-151
lines changed

.github/workflows/container-pytests.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/container-tests.yml

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,14 @@ on:
33
types:
44
- created
55
jobs:
6+
check-readme:
7+
uses: "sclorg/ci-actions/.github/workflows/check-readme.yml@main"
68
container-tests:
7-
name: "Container tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
8-
runs-on: ubuntu-latest
9-
concurrency:
10-
group: container-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
11-
cancel-in-progress: true
12-
strategy:
13-
fail-fast: false
14-
matrix:
15-
version: [ "2.4", "2.4-micro" ]
16-
os_test: [ "fedora", "rhel8", "rhel9", "rhel10", "c9s", "c10s" ]
17-
test_case: [ "container" ]
9+
needs: check-readme
10+
uses: "sclorg/ci-actions/.github/workflows/container-tests.yml@main"
11+
with:
12+
enabled-tests: '["container","container-pytest","openshift-4","openshift-pytest"]'
13+
versions: '["2.4", "2.4-micro"]'
14+
openshift-versions: '["2.4"]'
15+
secrets: inherit
1816

19-
if: |
20-
github.event.issue.pull_request
21-
&& (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))
22-
&& contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
23-
steps:
24-
- uses: sclorg/tfaga-wrapper@main
25-
with:
26-
os_test: ${{ matrix.os_test }}
27-
version: ${{ matrix.version }}
28-
test_case: ${{ matrix.test_case }}
29-
public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }}
30-
private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }}

.github/workflows/openshift-pytests.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

.github/workflows/openshift-tests.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

README.md

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ Apache HTTP Server Container Images
33

44
[![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)
55

6-
Images available on Quay are:
7-
* Fedora [httpd-2.4](https://quay.io/repository/fedora/httpd-24)
8-
96
This repository contains Dockerfiles for Apache HTTP Server images for OpenShift and general usage.
107
Users can choose between RHEL and CentOS based images.
118

@@ -17,19 +14,17 @@ For more information about concepts used in these container images, see the
1714

1815
Versions
1916
--------
20-
Apache HTTPD versions currently provided are:
21-
* [httpd-2.4](2.4)
22-
* [httpd-2.4-micro](2.4-micro)
23-
24-
RHEL versions currently supported are:
25-
* RHEL 8
26-
* RHEL 9
27-
* RHEL 10
28-
29-
CentOS Stream versions currently supported are:
30-
* CentOS Stream 9
31-
* CentOS Stream 10
32-
17+
Currently supported versions are visible in the following table, expand an entry to see its container registry address.
18+
<!--
19+
Table start
20+
-->
21+
||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10|
22+
|:--|:--:|:--:|:--:|:--:|:--:|:--:|
23+
|2.4-micro|<details><summary>✓</summary>`quay.io/sclorg/httpd-24-micro-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/httpd-24-micro-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/httpd-24-micro`</details>||||
24+
|2.4|<details><summary>✓</summary>`quay.io/sclorg/httpd-24-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/httpd-24-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/httpd-24`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/httpd-24`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/httpd-24`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/httpd-24`</details>|
25+
<!--
26+
Table end
27+
-->
3328

3429
Installation
3530
------------

0 commit comments

Comments
 (0)