diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
index 15eddc8..dd096c8 100644
--- a/.github/workflows/container-tests.yml
+++ b/.github/workflows/container-tests.yml
@@ -3,29 +3,13 @@ on:
types:
- created
jobs:
+ check-readme:
+ uses: "sclorg/ci-actions/.github/workflows/check-readme.yml@main"
container-tests:
- # This job only runs for '[test]' pull request comments by owner, member
- 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: [ "10.3", "10.5", "10.11", "11.8" ]
- os_test: [ "fedora", "rhel8", "rhel9", "c9s", "c10s", "rhel10" ]
- 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: '[ "10.3", "10.5", "10.11", "11.8" ]'
+ openshift-versions: '[ "10.3", "10.5", "10.11", "11.8" ]'
+ secrets: inherit
diff --git a/.github/workflows/openshift-pytests.yml b/.github/workflows/openshift-pytests.yml
deleted file mode 100644
index 16ff28a..0000000
--- 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: [ "10.3", "10.5", "10.11" ]
- 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 eb9f19b..0000000
--- 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: [ "10.3", "10.5", "10.11", "11.8" ]
- 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 }}
diff --git a/README.md b/README.md
index 140a1d3..5be13e5 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,6 @@ MariaDB SQL Database Server Docker Image
[](https://github.com/sclorg/mariadb-container/actions/workflows/build-and-push.yml)
-Images available on Quay are:
-* CentOS Stream 9 [mariadb-105](https://quay.io/repository/sclorg/mariadb-105-c9s)
-* CentOS Stream 9 [mariadb-1011](https://quay.io/repository/sclorg/mariadb-1011-c9s)
-* CentOS Stream 10 [mariadb-1011](https://quay.io/repository/sclorg/mariadb-1011-c10s)
-* Fedora [mariadb-1011](https://quay.io/repository/fedora/mariadb-1011)
-* Fedora [mariadb-118](https://quay.io/repository/fedora/mariadb-118)
-
This repository contains Dockerfiles for MariaDB images for OpenShift and general usage.
Users can choose between RHEL, Fedora and CentOS Stream based images.
@@ -27,20 +20,18 @@ For more information about concepts used in these podman images, see the
Versions
---------------
-MariaDB versions currently provided are:
-* [MariaDB 10.3](10.3)
-* [MariaDB 10.5](10.5)
-* [MariaDB 10.11](10.11)
-
-RHEL versions currently supported are:
-* RHEL8
-* RHEL9
-* RHEL10
-
-CentOS Stream versions currently supported are:
-* CentOS Stream 9
-* CentOS Stream 10
-
+
+||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10|
+|:--|:--:|:--:|:--:|:--:|:--:|:--:|
+|10.3||||✓
`registry.redhat.io/rhel8/mariadb-103`✓
`quay.io/sclorg/mariadb-105-c9s`✓
`registry.redhat.io/rhel8/mariadb-105`✓
`registry.redhat.io/rhel9/mariadb-105`✓
`quay.io/sclorg/mariadb-1011-c9s`✓
`quay.io/sclorg/mariadb-1011-c10s`✓
`quay.io/fedora/mariadb-1011`✓
`registry.redhat.io/rhel8/mariadb-1011`✓
`registry.redhat.io/rhel9/mariadb-1011`✓
`registry.redhat.io/rhel10/mariadb-1011`✓
`quay.io/fedora/mariadb-118`