From 1f3032a787699cc4a57b44bf7079d2e8326238b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Matczuk?= <michal@scylladb.com>
Date: Fri, 8 Nov 2019 00:11:50 +0100
Subject: [PATCH] Travis updated Go and Scylla version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Matczuk <michal@scylladb.com>
---
 .travis.yml         | 22 +++++++---------------
 .travis_start_db.sh | 24 ------------------------
 2 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100755 .travis_start_db.sh

diff --git a/.travis.yml b/.travis.yml
index 0bebca7..b1c96d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,15 @@
-sudo: true
 language: go
+
 go:
-  - 1.11.x
+  - stable
 
-env:
-  global:
-    - SCYLLA_OPTS="--developer-mode 1 --log-to-stdout 1 --default-log-level info"
-  matrix:
-    - DB="scylla"
-    - DB="cassandra"
-
-dist: trusty
-addons:
-  apt:
-    packages:
-      - moreutils
+services:
+  - docker
 
 before_install:
-  - ./.travis_start_db.sh
+  - docker pull scylladb/scylla:latest
+  - docker run --name scylla -p 9042:9042 -d scylladb/scylla
+  - until docker exec scylla cqlsh -e "DESCRIBE SCHEMA"; do sleep 2; done
 
 install:
   - make get-deps get-tools
diff --git a/.travis_start_db.sh b/.travis_start_db.sh
deleted file mode 100755
index 358d917..0000000
--- a/.travis_start_db.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-case ${DB} in
-
-scylla)
-    sudo curl -o /etc/apt/sources.list.d/scylla.list -L http://repositories.scylladb.com/scylla/repo/20fc70b18261bf832cf8e0733a27979c/ubuntu/scylladb-3.0-trusty.list
-    sudo apt-get -qq update
-    sudo apt-get install -y --allow-unauthenticated scylla-server
-    sudo /usr/bin/scylla --options-file /etc/scylla/scylla.yaml ${SCYLLA_OPTS} &> /tmp/scylla.log &
-    ;;
-
-cassandra)
-    sudo service cassandra start
-    ;;
-
-*)
-    env
-    false
-    ;;
-
-esac
-
-until nc -vz 127.0.0.1 9042; do sleep 1; done