From a4fab8332c413a84e12d65cec9768318abd5aa17 Mon Sep 17 00:00:00 2001 From: Petr Khartskhaev Date: Tue, 10 Feb 2026 16:08:20 +0100 Subject: [PATCH] Disable and remove openshift-4 bash tests --- .github/workflows/container-pytests.yml | 31 -------------- .github/workflows/container-tests.yml | 34 +++++----------- .github/workflows/openshift-pytests.yml | 41 ------------------- .github/workflows/openshift-tests.yml | 41 ------------------- test/run-openshift-remote-cluster | 39 ------------------ test/test-lib-openshift.sh | 1 - test/test-lib-remote-openshift.sh | 1 - test/test-lib-valkey.sh | 54 ------------------------- test/test-openshift.yaml | 1 - 9 files changed, 9 insertions(+), 234 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 delete mode 100755 test/run-openshift-remote-cluster delete mode 120000 test/test-lib-openshift.sh delete mode 120000 test/test-lib-remote-openshift.sh delete mode 100644 test/test-lib-valkey.sh delete mode 120000 test/test-openshift.yaml diff --git a/.github/workflows/container-pytests.yml b/.github/workflows/container-pytests.yml deleted file mode 100644 index 4cd9988..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: [ "8" ] - os_test: [ "fedora", "c10s", "rhel9", "rhel10" ] - 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 c387bed..da67d6b 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: [ "7", "8" ] - os_test: [ "fedora", "c10s", "rhel9", "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","container-pytest","openshift-pytest"]' + versions: '[ "7", "8" ]' + openshift-versions: '[ "7", "8" ]' + secrets: inherit diff --git a/.github/workflows/openshift-pytests.yml b/.github/workflows/openshift-pytests.yml deleted file mode 100644 index 707897b..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: [ "7", "8" ] - os_test: [ "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 96b5532..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: [ "7", "8" ] - os_test: [ "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/test/run-openshift-remote-cluster b/test/run-openshift-remote-cluster deleted file mode 100755 index 287aa50..0000000 --- a/test/run-openshift-remote-cluster +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# -# Test the Redis image in OpenShift (remote cluster) -# -# IMAGE_NAME specifies a name of the candidate image used for testing. -# The image has to be available before this script is executed. -# VERSION specifies the major version of the Redis in format of X.Y -# OS specifies RHEL version (e.g. OS=rhel8) -# - -THISDIR=$(dirname ${BASH_SOURCE[0]}) - -source ${THISDIR}/test-lib-valkey.sh - -TEST_LIST="\ -test_valkey_integration -test_valkey_imagestream -test_latest_imagestreams -" - -trap ct_os_cleanup EXIT SIGINT - -ct_os_set_ocp4 || exit $OC_ERR - -ct_os_check_compulsory_vars || exit $OC_ERR - -ct_os_tag_image_for_cvp "valkey" - -ct_os_check_login || exit $OC_ERR - -set -u - -# For testing on OpenShift 4 we use internal registry -export CT_OCP4_TEST=true - -TEST_SUMMARY='' -TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "openshift-remote-cluster" - -# vim: set tabstop=2:shiftwidth=2:expandtab: diff --git a/test/test-lib-openshift.sh b/test/test-lib-openshift.sh deleted file mode 120000 index f48003b..0000000 --- a/test/test-lib-openshift.sh +++ /dev/null @@ -1 +0,0 @@ -../common/test-lib-openshift.sh \ No newline at end of file diff --git a/test/test-lib-remote-openshift.sh b/test/test-lib-remote-openshift.sh deleted file mode 120000 index 15003d8..0000000 --- a/test/test-lib-remote-openshift.sh +++ /dev/null @@ -1 +0,0 @@ -../common/test-lib-remote-openshift.sh \ No newline at end of file diff --git a/test/test-lib-valkey.sh b/test/test-lib-valkey.sh deleted file mode 100644 index a18011e..0000000 --- a/test/test-lib-valkey.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# Functions for tests for the Redis image in OpenShift. -# -# IMAGE_NAME specifies a name of the candidate image used for testing. -# The image has to be available before this script is executed. -# - -THISDIR=$(dirname ${BASH_SOURCE[0]}) - -source "${THISDIR}/test-lib.sh" -source "${THISDIR}/test-lib-openshift.sh" -source "${THISDIR}/test-lib-remote-openshift.sh" - -function test_valkey_integration() { - local service_name=valkey - local tag="-el9" - if [ "${OS}" == "rhel10" ]; then - tag="-el10" - fi - TEMPLATES="valkey-ephemeral-template.json - valkey-persistent-template.json" - for template in $TEMPLATES; do - ct_os_test_template_app_func "${IMAGE_NAME}" \ - "${THISDIR}/examples/${template}" \ - "${service_name}" \ - "ct_os_check_cmd_internal 'registry.redhat.io/${OS}/valkey-${VERSION}' '${service_name}-testing' 'timeout 15 valkey-cli -h -a testp ping' 'PONG'" \ - "-p VALKEY_VERSION=${VERSION} \ - -p DATABASE_SERVICE_NAME="${service_name}-testing" \ - -p VALKEY_PASSWORD=testp" - done -} - -function test_valkey_imagestream() { - local tag="-el9" - if [ "${OS}" == "rhel10" ]; then - tag="-el10" - fi - TEMPLATES="valkey-ephemeral-template.json - valkey-persistent-template.json" - for template in $TEMPLATES; do - ct_os_test_image_stream_template "${THISDIR}/imagestreams/valkey-${OS//[0-9]/}.json" "${THISDIR}/examples/${template}" valkey "-p VALKEY_VERSION=${VERSION}${tag}" - done -} - -function test_latest_imagestreams() { - echo "Testing the latest version in imagestreams" - # Switch to root directory of a container - pushd "${THISDIR}/../.." >/dev/null - ct_check_latest_imagestreams - popd >/dev/null -} - -# vim: set tabstop=2:shiftwidth=2:expandtab: diff --git a/test/test-openshift.yaml b/test/test-openshift.yaml deleted file mode 120000 index 9316d8f..0000000 --- a/test/test-openshift.yaml +++ /dev/null @@ -1 +0,0 @@ -../common/test-openshift.yaml \ No newline at end of file