From 03085652ded7c31729680f11dae7281aa0e4ebb4 Mon Sep 17 00:00:00 2001 From: sylwiaszunejko Date: Fri, 31 May 2024 14:37:01 +0200 Subject: [PATCH] Always use latest scylla in CI --- .github/workflows/main.yml | 2 -- docker-compose.yml | 2 +- integration.sh | 5 +---- testdata/recreate/table_golden.cql | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc617c0a8..7fb130cd2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,8 +11,6 @@ jobs: build: name: Build runs-on: ubuntu-latest - env: - SCYLLA_IMAGE: scylladb/scylla:5.2.9 steps: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 diff --git a/docker-compose.yml b/docker-compose.yml index 8090eb7e2..48f317460 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: node_1: - image: ${SCYLLA_IMAGE} + image: scylladb/scylla-nightly privileged: true command: | --smp 2 diff --git a/integration.sh b/integration.sh index 6598599d1..b626be1d7 100755 --- a/integration.sh +++ b/integration.sh @@ -3,15 +3,12 @@ # Copyright (C) 2017 ScyllaDB # -readonly SCYLLA_IMAGE=${SCYLLA_IMAGE} - set -eu -o pipefail function scylla_up() { local -r exec="docker compose exec -T" - echo "==> Running Scylla ${SCYLLA_IMAGE}" - docker pull ${SCYLLA_IMAGE} + echo "==> Running Scylla" docker compose up -d --wait } diff --git a/testdata/recreate/table_golden.cql b/testdata/recreate/table_golden.cql index a70e8e81c..41c4a1bc1 100644 --- a/testdata/recreate/table_golden.cql +++ b/testdata/recreate/table_golden.cql @@ -42,7 +42,7 @@ CREATE TABLE gocqlx_table.monkeyspecies ( AND max_index_interval = 2048 AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 - AND read_repair_chance = 1 + AND read_repair_chance = 0 AND speculative_retry = '99.0PERCENTILE'; CREATE TABLE gocqlx_table.timeline (