Skip to content

Commit 6f78767

Browse files
authored
Reusable workflows readme (#631)
* Tests use reusable workflows from ci-actions * Add version table in main README.md
1 parent 1063d0e commit 6f78767

File tree

4 files changed

+23
-194
lines changed

4 files changed

+23
-194
lines changed

.github/workflows/container-tests.yml

Lines changed: 10 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -4,72 +4,14 @@ on:
44
- created
55
jobs:
66
distgen-check:
7-
name: "Check distgen generated files"
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-
if: |
13-
github.event.issue.pull_request
14-
&& (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))
15-
&& contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
16-
steps:
17-
- name: Checkout repo
18-
uses: actions/checkout@v5
19-
with:
20-
ref: "refs/pull/${{ github.event.issue.number }}/head"
21-
submodules: true
22-
23-
- name: Check distgen generated files
24-
id: check
25-
shell: bash
26-
run: |
27-
sha=$(git rev-parse HEAD)
28-
sudo apt update && sudo apt -y install python3-pip
29-
pip3 install distgen
30-
result="success"
31-
./common/tests/check_distgen_generated_files.sh || result="failure"
32-
echo "result=$result" >> "$GITHUB_OUTPUT"
33-
echo "sha=$sha" >> "$GITHUB_OUTPUT"
34-
35-
- name: Set final commit status
36-
uses: myrotvorets/[email protected]
37-
with:
38-
status: ${{ steps.check.outputs.result }}
39-
context: "Distgen check"
40-
sha: ${{ steps.check.outputs.sha }}
41-
42-
- name: Exit on ERR
43-
shell: bash
44-
run: |
45-
_result=${{ steps.check.outputs.result }}
46-
if [ "$_result" == failure ]; then
47-
echo "::error::Distgen-generated files are not regenerated properly."
48-
echo "::warning::Please regenerate them with:"
49-
echo "::warning::'make clean-versions'"
50-
echo "::warning::'make generate-all'"
51-
exit 1
52-
fi
7+
uses: "sclorg/ci-actions/.github/workflows/distgen-check.yml@main"
8+
check-readme:
9+
uses: "sclorg/ci-actions/.github/workflows/check-readme.yml@main"
5310
container-tests:
54-
needs: distgen-check
55-
runs-on: ubuntu-latest
56-
name: "Container tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
57-
strategy:
58-
fail-fast: false
59-
matrix:
60-
version: [ "11", "12", "13", "14", "15", "16" ]
61-
os_test: [ "fedora", "rhel8", "rhel9", "rhel10", "c9s", "c10s" ]
62-
test_case: [ "container" ]
63-
64-
if: |
65-
github.event.issue.pull_request
66-
&& (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))
67-
&& contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
68-
steps:
69-
- uses: sclorg/tfaga-wrapper@main
70-
with:
71-
os_test: ${{ matrix.os_test }}
72-
version: ${{ matrix.version }}
73-
test_case: ${{ matrix.test_case }}
74-
public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }}
75-
private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }}
11+
needs: check-readme
12+
uses: "sclorg/ci-actions/.github/workflows/container-tests.yml@main"
13+
with:
14+
enabled-tests: '["container","openshift-4","openshift-pytest"]'
15+
versions: '[ "12", "13", "15", "16" ]'
16+
openshift-versions: '[ "12", "13", "15", "16" ]'
17+
secrets: inherit

.github/workflows/openshift-pytests.yml

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

.github/workflows/openshift-tests.yml

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

README.md

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22

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

5-
Images available on Quay.io are:
6-
7-
- CentOS Stream 9 [postgresql-13](https://quay.io/repository/sclorg/postgresql-13-c9s)
8-
- CentOS Stream 9 [postgresql-15](https://quay.io/repository/sclorg/postgresql-15-c9s)
9-
- CentOS Stream 9 [postgresql-16](https://quay.io/repository/sclorg/postgresql-16-c9s)
10-
- CentOS Stream 10 [postgresql-16](https://quay.io/repository/sclorg/postgresql-16-c10s)
11-
- Fedora [postgresql-15](https://quay.io/repository/fedora/postgresql-15)
12-
- Fedora [postgresql-16](https://quay.io/repository/fedora/postgresql-16)
13-
145
This repository provides Dockerfiles for PostgreSQL container images, optimized for use with OpenShift. These images are available in RHEL, Fedora, and CentOS-based variants.
156

167
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
1910
For learning more information about concepts used in these container images, see the [Landing page](https://github.com/sclorg/welcome).
2011

2112
## Versions
22-
23-
PostgreSQL versions currently supported are:
24-
25-
- [postgresql-12](https://github.com/sclorg/postgresql-container/tree/master/12)
26-
- [postgresql-13](https://github.com/sclorg/postgresql-container/tree/master/13)
27-
- [postgresql-15](https://github.com/sclorg/postgresql-container/tree/master/15)
28-
- [postgresql-16](https://github.com/sclorg/postgresql-container/tree/master/16)
29-
30-
RHEL versions currently supported are:
31-
- RHEL8
32-
- RHEL9
33-
- RHEL10
34-
35-
CentOS Stream versions currently supported are:
36-
- CentOS Stream 9
37-
- CentOS Stream 10
13+
Currently supported versions are visible in the following table, expand an entry to see its container registry address.
14+
<!--
15+
Table start
16+
-->
17+
||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10|
18+
|:--|:--:|:--:|:--:|:--:|:--:|:--:|
19+
|12||||<details><summary>✓</summary>`registry.redhat.io/rhel8/postgresql-12`</details>|||
20+
|13|<details><summary>✓</summary>`quay.io/sclorg/postgresql-13-c9s`</details>|||<details><summary>✓</summary>`registry.redhat.io/rhel8/postgresql-13`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/postgresql-13`</details>||
21+
|15|<details><summary>✓</summary>`quay.io/sclorg/postgresql-15-c9s`</details>||<details><summary>✓</summary>`quay.io/fedora/postgresql-15`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/postgresql-15`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/postgresql-15`</details>||
22+
|16|<details><summary>✓</summary>`quay.io/sclorg/postgresql-16-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/postgresql-16-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/postgresql-16`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/postgresql-16`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/postgresql-16`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/postgresql-16`</details>|
23+
<!--
24+
Table end
25+
-->
3826

3927
## Installation
4028

0 commit comments

Comments
 (0)