[COMMIT scylla-cluster-tests master] fix(c-s): update the docker image we use for c-s

0 views

Skip to first unread message

Commit Bot

<bot@cloudius-systems.com>

unread,

Jul 1, 2024, 5:19:30 PMJul 1

to scylladb-dev@googlegroups.com, Israel Fruchter

From: Israel Fruchter <fr...@scylladb.com>
Committer: Israel Fruchter <israel....@gmail.com>
Branch: master

fix(c-s): update the docker image we use for c-s

until we'll have an offical release of c-s seperate from scylla core
we built this image, base on the version from scylla 6.0
this version should have tablets support (which 5.4.6 didn't had)

---
diff --git a/defaults/test_default.yaml b/defaults/test_default.yaml
--- a/defaults/test_default.yaml
+++ b/defaults/test_default.yaml
@@ -208,7 +208,7 @@ stress_image:
ndbench: 'scylladb/hydra-loaders:ndbench-jdk8-20210720'
ycsb: 'scylladb/hydra-loaders:ycsb-jdk8-20220918'
nosqlbench: 'scylladb/hydra-loaders:nosqlbench-4.15.49'
- cassandra-stress: 'scylladb/scylla:5.4.6' # empty default would be same version as scylla under test
+ cassandra-stress: 'docker.io/scylladb/hydra-loaders:cassandra-stress-6.0-20240701'
scylla-bench: 'scylladb/hydra-loaders:scylla-bench-v0.1.21'
gemini: 'scylladb/hydra-loaders:gemini-v1.8.6'
alternator-dns: 'scylladb/hydra-loaders:alternator-dns-0.1'
diff --git a/docker/cassandra-stress/Dockerfile-deb b/docker/cassandra-stress/Dockerfile-deb
--- a/docker/cassandra-stress/Dockerfile-deb
+++ b/docker/cassandra-stress/Dockerfile-deb
@@ -6,6 +6,11 @@ ARG DEB_KEY
ENV DEB_LIST_URL=${DEB_LIST_URL:-https://s3.amazonaws.com/downloads.scylladb.com/unstable/scylla/branch-5.1/deb/unified/2022-08-18T12%3A17%3A46Z/scylladb-5.1/scylla.list}
ENV DEB_KEY=${DEB_KEY:-D0A112E067426AB2}

+
+RUN echo \
+ "deb http://deb.debian.org/debian unstable main non-free contrib" | \
+ tee /etc/apt/sources.list.d/non-free.list > /dev/null
+
RUN apt-get update && apt-get -y install wget gnupg2 \
&& wget ${DEB_LIST_URL} \
&& mv scylla.list /etc/apt/sources.list.d/ \
diff --git a/docker/cassandra-stress/README.md b/docker/cassandra-stress/README.md
--- a/docker/cassandra-stress/README.md
+++ b/docker/cassandra-stress/README.md
@@ -2,9 +2,9 @@
### Building from DEB files (quicker)

```
-export DEB_LIST_URL=https://s3.amazonaws.com/downloads.scylladb.com/unstable/scylla/branch-5.1/deb/unified/2022-08-18T12%3A17%3A46Z/scylladb-5.1/scylla.list
-export CS_DOCKER_IMAGE=scylladb/hydra-loaders:cassandra-stress-$(date +'%Y%m%d')
-docker build . -t ${CS_DOCKER_IMAGE} -f Dockerfile-deb --build-arg DEB_LIST_URL=$DEB_LIST_URL
+export DEB_LIST_URL=https://s3.amazonaws.com/downloads.scylladb.com/unstable/scylla/branch-6.0/deb/unified/latest/scylladb-6.0/scylla.list
+export CS_DOCKER_IMAGE=scylladb/hydra-loaders:cassandra-stress-6.0-$(date +'%Y%m%d')
+docker build . -t ${CS_DOCKER_IMAGE} -f Dockerfile-deb --build-arg DEB_LIST_URL=$DEB_LIST_URL --build-arg DEB_KEY=87722433EBB454AE
docker push ${CS_DOCKER_IMAGE}
```

Commit Bot

<bot@cloudius-systems.com>

unread,

Jul 2, 2024, 1:54:35 AMJul 2

to scylladb-dev@googlegroups.com, Israel Fruchter

From: Israel Fruchter <fr...@scylladb.com>
Committer: Israel Fruchter <israel....@gmail.com>

Branch: branch-6.0

fix(c-s): update the docker image we use for c-s

until we'll have an offical release of c-s seperate from scylla core
we built this image, base on the version from scylla 6.0
this version should have tablets support (which 5.4.6 didn't had)

(cherry picked from commit f205a48beb6ec927290722e96b5730e82f7b18c5)

---
diff --git a/defaults/test_default.yaml b/defaults/test_default.yaml
--- a/defaults/test_default.yaml
+++ b/defaults/test_default.yaml