From a8ec9f5b6f05f0e084804f20e18fc4f894f79e52 Mon Sep 17 00:00:00 2001 From: Yaniv Michael Kaul Date: Tue, 1 Apr 2025 17:07:26 +0300 Subject: [PATCH] Update ScyllaDB versions used in Github actions 1. Removed 2023.1.x 2. Update 6.2.0 to 6.2.3 3. Update 2024.1.11 to 2024.1.15 4. Update 2025.1.0-rc4 to 2025.1.0 GA Signed-off-by: Yaniv Kaul --- ...ation-tests-2023.1.11-IPV4-raftschema.yaml | 119 ------------------ .../integration-tests-2023.1.11-IPV4.yaml | 119 ------------------ ...ation-tests-2023.1.11-IPV6-raftschema.yaml | 119 ------------------ ... => integration-tests-2024.1.15-IPV4.yaml} | 2 +- ... => integration-tests-2024.1.15-IPV6.yaml} | 2 +- ...on-tests-2025.1.0-IPV4-tablets-nossl.yaml} | 2 +- ...l => integration-tests-2025.1.0-IPV6.yaml} | 2 +- ...integration-tests-6.2.3-IPV4-tablets.yaml} | 2 +- ...yaml => integration-tests-6.2.3-IPV4.yaml} | 2 +- ...ation-tests-6.2.3-IPV6-tablets-nossl.yaml} | 2 +- 10 files changed, 7 insertions(+), 364 deletions(-) delete mode 100644 .github/workflows/integration-tests-2023.1.11-IPV4-raftschema.yaml delete mode 100644 .github/workflows/integration-tests-2023.1.11-IPV4.yaml delete mode 100644 .github/workflows/integration-tests-2023.1.11-IPV6-raftschema.yaml rename .github/workflows/{integration-tests-2024.1.12-IPV4.yaml => integration-tests-2024.1.15-IPV4.yaml} (99%) rename .github/workflows/{integration-tests-2024.1.12-IPV6.yaml => integration-tests-2024.1.15-IPV6.yaml} (99%) rename .github/workflows/{integration-tests-2025.1.0-rc4-IPV4-tablets-nossl.yaml => integration-tests-2025.1.0-IPV4-tablets-nossl.yaml} (99%) rename .github/workflows/{integration-tests-2025.1.0-rc4-IPV6.yaml => integration-tests-2025.1.0-IPV6.yaml} (99%) rename .github/workflows/{integration-tests-6.2.0-IPV4-tablets.yaml => integration-tests-6.2.3-IPV4-tablets.yaml} (99%) rename .github/workflows/{integration-tests-6.2.0-IPV4.yaml => integration-tests-6.2.3-IPV4.yaml} (99%) rename .github/workflows/{integration-tests-6.2.0-IPV6-tablets-nossl.yaml => integration-tests-6.2.3-IPV6-tablets-nossl.yaml} (99%) diff --git a/.github/workflows/integration-tests-2023.1.11-IPV4-raftschema.yaml b/.github/workflows/integration-tests-2023.1.11-IPV4-raftschema.yaml deleted file mode 100644 index 17a9dc0bc6..0000000000 --- a/.github/workflows/integration-tests-2023.1.11-IPV4-raftschema.yaml +++ /dev/null @@ -1,119 +0,0 @@ -concurrency: - cancel-in-progress: true - group: int-${{ github.workflow }}-${{ github.ref }} -env: - scylla-version: scylla-enterprise:2023.1.11 - ip-family: IPV4 - raft-schema: enabled - tablets: none - ssl-enabled: "true" -jobs: - backup: - name: Test backup - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/backup - repair: - name: Test repair - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair - restore-schema: - name: Test restore schema - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"' - restore-tables: - name: Test restore tables - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"' - small-pkg: - name: Test other, smaller packages - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Set IP_FAMILY and SSL_ENABLED var for all tests - run: | - echo "IP_FAMILY=${{ env.ip-family }}" >> $GITHUB_ENV - echo "SSL_ENABLED=${{ env.ssl-enabled }}" >> $GITHUB_ENV - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run cqlping tests - run: make pkg-integration-test PKG=./pkg/ping/cqlping - - name: Run dynamoping tests - run: make pkg-integration-test PKG=./pkg/ping/dynamoping - - name: Run scyllaclient tests - run: make pkg-integration-test PKG=./pkg/scyllaclient - - name: Run cluster tests - run: make pkg-integration-test PKG=./pkg/service/cluster - - name: Run healthcheck tests - run: make pkg-integration-test PKG=./pkg/service/healthcheck - - name: Run scheduler tests - run: make pkg-integration-test PKG=./pkg/service/scheduler - - name: Run store tests - run: make pkg-integration-test PKG=./pkg/store - - name: Run migrate tests - run: make pkg-integration-test PKG=./pkg/schema/migrate -name: integration-tests-2023.1.11-IPV4-raftschema -"on": - pull_request: - types: - - opened - - synchronize - - reopened - push: - branches: - - master - - branch-** diff --git a/.github/workflows/integration-tests-2023.1.11-IPV4.yaml b/.github/workflows/integration-tests-2023.1.11-IPV4.yaml deleted file mode 100644 index a15d1b43ee..0000000000 --- a/.github/workflows/integration-tests-2023.1.11-IPV4.yaml +++ /dev/null @@ -1,119 +0,0 @@ -concurrency: - cancel-in-progress: true - group: int-${{ github.workflow }}-${{ github.ref }} -env: - scylla-version: scylla-enterprise:2023.1.11 - ip-family: IPV4 - raft-schema: disabled - tablets: none - ssl-enabled: "true" -jobs: - backup: - name: Test backup - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/backup - repair: - name: Test repair - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair - restore-schema: - name: Test restore schema - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"' - restore-tables: - name: Test restore tables - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"' - small-pkg: - name: Test other, smaller packages - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Set IP_FAMILY and SSL_ENABLED var for all tests - run: | - echo "IP_FAMILY=${{ env.ip-family }}" >> $GITHUB_ENV - echo "SSL_ENABLED=${{ env.ssl-enabled }}" >> $GITHUB_ENV - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run cqlping tests - run: make pkg-integration-test PKG=./pkg/ping/cqlping - - name: Run dynamoping tests - run: make pkg-integration-test PKG=./pkg/ping/dynamoping - - name: Run scyllaclient tests - run: make pkg-integration-test PKG=./pkg/scyllaclient - - name: Run cluster tests - run: make pkg-integration-test PKG=./pkg/service/cluster - - name: Run healthcheck tests - run: make pkg-integration-test PKG=./pkg/service/healthcheck - - name: Run scheduler tests - run: make pkg-integration-test PKG=./pkg/service/scheduler - - name: Run store tests - run: make pkg-integration-test PKG=./pkg/store - - name: Run migrate tests - run: make pkg-integration-test PKG=./pkg/schema/migrate -name: integration-tests-2023.1.11-IPV4 -"on": - pull_request: - types: - - opened - - synchronize - - reopened - push: - branches: - - master - - branch-** diff --git a/.github/workflows/integration-tests-2023.1.11-IPV6-raftschema.yaml b/.github/workflows/integration-tests-2023.1.11-IPV6-raftschema.yaml deleted file mode 100644 index 1c6eb772eb..0000000000 --- a/.github/workflows/integration-tests-2023.1.11-IPV6-raftschema.yaml +++ /dev/null @@ -1,119 +0,0 @@ -concurrency: - cancel-in-progress: true - group: int-${{ github.workflow }}-${{ github.ref }} -env: - scylla-version: scylla-enterprise:2023.1.11 - ip-family: IPV6 - raft-schema: enabled - tablets: none - ssl-enabled: "true" -jobs: - backup: - name: Test backup - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/backup - repair: - name: Test repair - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/repair - restore-schema: - name: Test restore schema - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"' - restore-tables: - name: Test restore tables - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} SSL_ENABLED=${{ env.ssl-enabled}} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"' - small-pkg: - name: Test other, smaller packages - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - - name: Set IP_FAMILY and SSL_ENABLED var for all tests - run: | - echo "IP_FAMILY=${{ env.ip-family }}" >> $GITHUB_ENV - echo "SSL_ENABLED=${{ env.ssl-enabled }}" >> $GITHUB_ENV - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - ip-family: ${{ env.ip-family }} - raft-schema: ${{ env.raft-schema }} - scylla-version: ${{ env.scylla-version }} - ssl-enabled: ${{ env.ssl-enabled }} - tablets: ${{ env.tablets }} - - name: Run cqlping tests - run: make pkg-integration-test PKG=./pkg/ping/cqlping - - name: Run dynamoping tests - run: make pkg-integration-test PKG=./pkg/ping/dynamoping - - name: Run scyllaclient tests - run: make pkg-integration-test PKG=./pkg/scyllaclient - - name: Run cluster tests - run: make pkg-integration-test PKG=./pkg/service/cluster - - name: Run healthcheck tests - run: make pkg-integration-test PKG=./pkg/service/healthcheck - - name: Run scheduler tests - run: make pkg-integration-test PKG=./pkg/service/scheduler - - name: Run store tests - run: make pkg-integration-test PKG=./pkg/store - - name: Run migrate tests - run: make pkg-integration-test PKG=./pkg/schema/migrate -name: integration-tests-2023.1.11-IPV6-raftschema -"on": - pull_request: - types: - - opened - - synchronize - - reopened - push: - branches: - - master - - branch-** diff --git a/.github/workflows/integration-tests-2024.1.12-IPV4.yaml b/.github/workflows/integration-tests-2024.1.15-IPV4.yaml similarity index 99% rename from .github/workflows/integration-tests-2024.1.12-IPV4.yaml rename to .github/workflows/integration-tests-2024.1.15-IPV4.yaml index 0b6207ba2b..d0fd445a62 100644 --- a/.github/workflows/integration-tests-2024.1.12-IPV4.yaml +++ b/.github/workflows/integration-tests-2024.1.15-IPV4.yaml @@ -2,7 +2,7 @@ concurrency: cancel-in-progress: true group: int-${{ github.workflow }}-${{ github.ref }} env: - scylla-version: scylla-enterprise:2024.1.12 + scylla-version: scylla-enterprise:2024.1.15 ip-family: IPV4 raft-schema: none tablets: none diff --git a/.github/workflows/integration-tests-2024.1.12-IPV6.yaml b/.github/workflows/integration-tests-2024.1.15-IPV6.yaml similarity index 99% rename from .github/workflows/integration-tests-2024.1.12-IPV6.yaml rename to .github/workflows/integration-tests-2024.1.15-IPV6.yaml index 6950323ad8..8919d5964c 100644 --- a/.github/workflows/integration-tests-2024.1.12-IPV6.yaml +++ b/.github/workflows/integration-tests-2024.1.15-IPV6.yaml @@ -2,7 +2,7 @@ concurrency: cancel-in-progress: true group: int-${{ github.workflow }}-${{ github.ref }} env: - scylla-version: scylla-enterprise:2024.1.12 + scylla-version: scylla-enterprise:2024.1.15 ip-family: IPV6 raft-schema: none tablets: none diff --git a/.github/workflows/integration-tests-2025.1.0-rc4-IPV4-tablets-nossl.yaml b/.github/workflows/integration-tests-2025.1.0-IPV4-tablets-nossl.yaml similarity index 99% rename from .github/workflows/integration-tests-2025.1.0-rc4-IPV4-tablets-nossl.yaml rename to .github/workflows/integration-tests-2025.1.0-IPV4-tablets-nossl.yaml index 1ff89707c8..d19cc5c546 100644 --- a/.github/workflows/integration-tests-2025.1.0-rc4-IPV4-tablets-nossl.yaml +++ b/.github/workflows/integration-tests-2025.1.0-IPV4-tablets-nossl.yaml @@ -2,7 +2,7 @@ concurrency: cancel-in-progress: true group: int-${{ github.workflow }}-${{ github.ref }} env: - scylla-version: scylla:2025.1.0-rc4 + scylla-version: scylla:2025.1.0 ip-family: IPV4 raft-schema: none tablets: enabled diff --git a/.github/workflows/integration-tests-2025.1.0-rc4-IPV6.yaml b/.github/workflows/integration-tests-2025.1.0-IPV6.yaml similarity index 99% rename from .github/workflows/integration-tests-2025.1.0-rc4-IPV6.yaml rename to .github/workflows/integration-tests-2025.1.0-IPV6.yaml index 5c5a08beff..b017e7eb1f 100644 --- a/.github/workflows/integration-tests-2025.1.0-rc4-IPV6.yaml +++ b/.github/workflows/integration-tests-2025.1.0-IPV6.yaml @@ -2,7 +2,7 @@ concurrency: cancel-in-progress: true group: int-${{ github.workflow }}-${{ github.ref }} env: - scylla-version: scylla:2025.1.0-rc4 + scylla-version: scylla:2025.1.0 ip-family: IPV6 raft-schema: none tablets: disabled diff --git a/.github/workflows/integration-tests-6.2.0-IPV4-tablets.yaml b/.github/workflows/integration-tests-6.2.3-IPV4-tablets.yaml similarity index 99% rename from .github/workflows/integration-tests-6.2.0-IPV4-tablets.yaml rename to .github/workflows/integration-tests-6.2.3-IPV4-tablets.yaml index 1a069f8f42..d30de2ce8d 100644 --- a/.github/workflows/integration-tests-6.2.0-IPV4-tablets.yaml +++ b/.github/workflows/integration-tests-6.2.3-IPV4-tablets.yaml @@ -2,7 +2,7 @@ concurrency: cancel-in-progress: true group: int-${{ github.workflow }}-${{ github.ref }} env: - scylla-version: scylla:6.2.0 + scylla-version: scylla:6.2.3 ip-family: IPV4 raft-schema: none tablets: enabled diff --git a/.github/workflows/integration-tests-6.2.0-IPV4.yaml b/.github/workflows/integration-tests-6.2.3-IPV4.yaml similarity index 99% rename from .github/workflows/integration-tests-6.2.0-IPV4.yaml rename to .github/workflows/integration-tests-6.2.3-IPV4.yaml index 11216c92b4..f1fca3bc87 100644 --- a/.github/workflows/integration-tests-6.2.0-IPV4.yaml +++ b/.github/workflows/integration-tests-6.2.3-IPV4.yaml @@ -2,7 +2,7 @@ concurrency: cancel-in-progress: true group: int-${{ github.workflow }}-${{ github.ref }} env: - scylla-version: scylla:6.2.0 + scylla-version: scylla:6.2.3 ip-family: IPV4 raft-schema: none tablets: disabled diff --git a/.github/workflows/integration-tests-6.2.0-IPV6-tablets-nossl.yaml b/.github/workflows/integration-tests-6.2.3-IPV6-tablets-nossl.yaml similarity index 99% rename from .github/workflows/integration-tests-6.2.0-IPV6-tablets-nossl.yaml rename to .github/workflows/integration-tests-6.2.3-IPV6-tablets-nossl.yaml index 84b55f3839..288cadf4da 100644 --- a/.github/workflows/integration-tests-6.2.0-IPV6-tablets-nossl.yaml +++ b/.github/workflows/integration-tests-6.2.3-IPV6-tablets-nossl.yaml @@ -2,7 +2,7 @@ concurrency: cancel-in-progress: true group: int-${{ github.workflow }}-${{ github.ref }} env: - scylla-version: scylla:6.2.0 + scylla-version: scylla:6.2.3 ip-family: IPV6 raft-schema: none tablets: enabled