diff --git a/.github/workflows/container-pytests.yml b/.github/workflows/container-pytests.yml
deleted file mode 100644
index e8bfd9e..0000000
--- a/.github/workflows/container-pytests.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-on:
- issue_comment:
- types:
- - created
-jobs:
- container-tests:
- # This job only runs for '[test-pytest]' pull request comments by owner, member
- runs-on: ubuntu-latest
- name: "Container-PyTests: ${{ matrix.version }} - ${{ matrix.os_test }}"
- concurrency:
- group: container-pytest-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
- cancel-in-progress: true
- strategy:
- fail-fast: false
- matrix:
- version: [ "6", "7" ]
- os_test: [ "fedora", "rhel8", "rhel9", "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 9bb60a6..f8a8159 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
- runs-on: ubuntu-latest
- name: "Container-tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
- concurrency:
- group: container-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
- cancel-in-progress: true
- strategy:
- fail-fast: false
- matrix:
- version: [ "6", "7" ]
- os_test: [ "fedora", "rhel8", "rhel9", "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: '[ "6", "7" ]'
+ openshift-versions: '[ "6", "7" ]'
+ secrets: inherit
diff --git a/.github/workflows/openshift-pytests.yml b/.github/workflows/openshift-pytests.yml
deleted file mode 100644
index ac76ff2..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: [ "6", "7" ]
- os_test: [ "rhel8", "rhel9"]
- 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 7e979b8..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: [ "6", "7" ]
- os_test: [ "rhel8", "rhel9"]
- 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 7ab690f..50981d3 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,6 @@ Redis container image
[](https://github.com/sclorg/redis-container/actions/workflows/build-and-push.yml)
-Images available on Quay are:
-* CentOS Stream 9 [redis-6](https://quay.io/repository/sclorg/redis-6-c9s)
-* CentOS Stream 9 [redis-7](https://quay.io/repository/sclorg/redis-7-c9s)
-* Fedora [redis-7](https://quay.io/repository/fedora/redis-7)
-
This repository contains Dockerfiles for Redis container image.
Users can choose between RHEL, Fedora and CentOS Stream based images.
@@ -19,17 +14,17 @@ For more information about concepts used in these container images, see the
Versions
--------
-Redis version currently provided are:
-* [redis-6](6)
-* [redis-7](7)
-
-RHEL versions currently supported are:
-* RHEL8
-* RHEL9
-
-CentOS Stream versions currently supported are:
-* CentOS Stream 9
-
+Currently supported versions are visible in the following table, expand an entry to see its container registry address.
+
+||CentOS Stream 9|Fedora|RHEL 8|RHEL 9|
+|:--|:--:|:--:|:--:|:--:|
+|6|||✓
`registry.redhat.io/rhel8/redis-6`✓
`quay.io/sclorg/redis-7-c9s`✓
`quay.io/fedora/redis-7`✓
`registry.redhat.io/rhel9/redis-7`