tests: split CephObjectSuite into TLS and non-TLS jobs

The CephObjectSuite ran both the TLS and non-TLS object store tests in a
single job via `-run CephObjectSuite`, executing TestWithTLS and
TestWithoutTLS sequentially. Split every invocation of the suite so the two
variants run as independent jobs, using `-run CephObjectSuite/TestWithoutTLS`
and `-run CephObjectSuite/TestWithTLS`, matching the existing CephUpgradeSuite
split pattern.

Each workflow that runs the suite now has two jobs, one per variant, in the
same file:

- integration-test-object-suite.yaml (PR): TestCephObjectSuite and
  TestCephObjectSuiteTLS
- integration-tests-on-release.yaml (push): TestCephObjectSuite and
  TestCephObjectSuiteTLS
- daily-nightly-jobs.yml (nightly): object-suite-ceph-main and
  object-suite-tls-ceph-main

The TestCephObjectSuite job name is preserved so the existing required
status check is unchanged.

No Go changes are required; ObjectSuite already separates the two methods.

Signed-off-by: Joshua Hoblitt <josh@hoblitt.com>
(cherry picked from commit c123513543)
This commit is contained in:
Joshua Hoblitt authored and Mergify committed 2026-06-10 21:27:15 +00:00
1 parent 9cc9f52f56
commit 9eb2a648dc
3 files changed
+135 -7

No files matched your search

+42 -2
View File
@@ -210,10 +210,10 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
kubernetes-version: "v1.35.5"
- name: TestCephObjectSuite
- name: TestCephObjectSuite (without TLS)
run: |
export DEVICE_FILTER=$(tests/scripts/github-action-helper.sh find_extra_block_dev)
SKIP_CLEANUP_POLICY=false CEPH_SUITE_VERSION=main go test -v -timeout 1800s -failfast -run TestCephObjectSuite github.com/rook/rook/tests/integration
SKIP_CLEANUP_POLICY=false CEPH_SUITE_VERSION=main go test -v -timeout 1800s -failfast -run CephObjectSuite/TestWithoutTLS github.com/rook/rook/tests/integration
- name: collect common logs
if: always()
@@ -230,6 +230,46 @@ jobs:
name: ceph-object-suite-main-artifact
path: /home/runner/work/rook/rook/tests/integration/_output/tests/
object-suite-tls-ceph-main:
if: github.repository == 'rook/rook'
runs-on: ubuntu-22.04
steps:
- name: checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0
- name: consider tmate debugging
uses: ./.github/workflows/tmate_debug
with:
use-tmate: ${{ secrets.USE_TMATE }}
- name: setup cluster resources
uses: ./.github/workflows/integration-test-setup-cluster-resources
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
kubernetes-version: "v1.35.5"
- name: TestCephObjectSuiteTLS
run: |
export DEVICE_FILTER=$(tests/scripts/github-action-helper.sh find_extra_block_dev)
SKIP_CLEANUP_POLICY=false CEPH_SUITE_VERSION=main go test -v -timeout 1800s -failfast -run CephObjectSuite/TestWithTLS github.com/rook/rook/tests/integration
- name: collect common logs
if: always()
run: |
export LOG_DIR="/home/runner/work/rook/rook/tests/integration/_output/tests/"
export CLUSTER_NAMESPACE="object-ns"
export OPERATOR_NAMESPACE="object-ns-system"
tests/scripts/collect-logs.sh
- name: Artifact
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
if: failure()
with:
name: ceph-object-suite-tls-main-artifact
path: /home/runner/work/rook/rook/tests/integration/_output/tests/
upgrade-from-squid-stable-to-squid-devel:
if: github.repository == 'rook/rook'
runs-on: ubuntu-22.04
@@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-version: ["v1.31.14", "v1.35.5"]
kubernetes-version: ["v1.31.14"] # test only on oldest supported k8s version
steps:
- name: checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -56,7 +56,7 @@ jobs:
run: |
tests/scripts/github-action-helper.sh collect_udev_logs_in_background
export DEVICE_FILTER=$(tests/scripts/github-action-helper.sh find_extra_block_dev)
SKIP_CLEANUP_POLICY=false go test -v -timeout 2400s -failfast -run CephObjectSuite github.com/rook/rook/tests/integration
SKIP_CLEANUP_POLICY=false go test -v -timeout 2400s -failfast -run CephObjectSuite/TestWithoutTLS github.com/rook/rook/tests/integration
- name: collect common logs
if: always()
@@ -77,3 +77,53 @@ jobs:
uses: ./.github/workflows/upterm_debug
with:
debug-ci: ${{ contains(github.event.pull_request.labels.*.name, 'debug-ci') }}
TestCephObjectSuiteTLS:
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/master' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
kubernetes-version: ["v1.35.5"] # test only on latest supported k8s version
steps:
- name: checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0
- name: consider (pre-job) debugging
uses: ./.github/workflows/tmate_debug
with:
use-tmate: ${{ secrets.USE_TMATE }}
debug-ci: ${{ contains(github.event.pull_request.labels.*.name, 'debug-ci') }}
- name: setup cluster resources
uses: ./.github/workflows/integration-test-setup-cluster-resources
with:
kubernetes-version: ${{ matrix.kubernetes-version }}
- name: TestCephObjectSuiteTLS
run: |
tests/scripts/github-action-helper.sh collect_udev_logs_in_background
export DEVICE_FILTER=$(tests/scripts/github-action-helper.sh find_extra_block_dev)
SKIP_CLEANUP_POLICY=false go test -v -timeout 2400s -failfast -run CephObjectSuite/TestWithTLS github.com/rook/rook/tests/integration
- name: collect common logs
if: always()
run: |
export LOG_DIR="/home/runner/work/rook/rook/tests/integration/_output/tests/"
export CLUSTER_NAMESPACE="object-ns"
export OPERATOR_NAMESPACE="object-ns-system"
tests/scripts/collect-logs.sh
- name: Artifact
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
if: failure()
with:
name: ceph-object-suite-tls-artifact-${{ matrix.kubernetes-version }}
path: /home/runner/work/rook/rook/tests/integration/_output/tests/
- name: consider (post-job) debugging
uses: ./.github/workflows/upterm_debug
with:
debug-ci: ${{ contains(github.event.pull_request.labels.*.name, 'debug-ci') }}
@@ -222,7 +222,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-version: ["v1.31.14", "v1.35.5"]
kubernetes-version: ["v1.31.14"] # test only on oldest supported k8s version
steps:
- name: checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -234,11 +234,11 @@ jobs:
with:
kubernetes-version: ${{ matrix.kubernetes-version }}
- name: TestCephObjectSuite
- name: TestCephObjectSuite (without TLS)
run: |
tests/scripts/github-action-helper.sh collect_udev_logs_in_background
export DEVICE_FILTER=$(tests/scripts/github-action-helper.sh find_extra_block_dev)
SKIP_CLEANUP_POLICY=false go test -v -timeout 2400s -failfast -run CephObjectSuite github.com/rook/rook/tests/integration
SKIP_CLEANUP_POLICY=false go test -v -timeout 2400s -failfast -run CephObjectSuite/TestWithoutTLS github.com/rook/rook/tests/integration
- name: collect common logs
if: always()
@@ -254,3 +254,41 @@ jobs:
with:
name: ceph-object-suite-artifact-${{ matrix.kubernetes-version }}
path: /home/runner/work/rook/rook/tests/integration/_output/tests/
TestCephObjectSuiteTLS:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
kubernetes-version: ["v1.35.5"] # test only on latest supported k8s version
steps:
- name: checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0
- name: setup cluster resources
uses: ./.github/workflows/integration-test-setup-cluster-resources
with:
kubernetes-version: ${{ matrix.kubernetes-version }}
- name: TestCephObjectSuiteTLS
run: |
tests/scripts/github-action-helper.sh collect_udev_logs_in_background
export DEVICE_FILTER=$(tests/scripts/github-action-helper.sh find_extra_block_dev)
SKIP_CLEANUP_POLICY=false go test -v -timeout 2400s -failfast -run CephObjectSuite/TestWithTLS github.com/rook/rook/tests/integration
- name: collect common logs
if: always()
run: |
export LOG_DIR="/home/runner/work/rook/rook/tests/integration/_output/tests/"
export CLUSTER_NAMESPACE="object-ns"
export OPERATOR_NAMESPACE="object-ns-system"
tests/scripts/collect-logs.sh
- name: Artifact
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
if: failure()
with:
name: ceph-object-suite-tls-artifact-${{ matrix.kubernetes-version }}
path: /home/runner/work/rook/rook/tests/integration/_output/tests/