Skip to content

Commit 702d673

Browse files
committed
travis-ci: update tarantool to 1.10 in a test job
I have got the following error in Travis-CI for tarantool-1.6 repository: | The following packages have unmet dependencies: | tarantool : Depends: tarantool-common (>= 1.6.9) but it is not going to be installed | Conflicts: libtarantool-dev (< 1.6~) but 1.5.1.218.g1a69fd6-1ubuntu1 is to be installed | E: Unable to correct problems, you have held broken packages. Our 1.6 repository lack of libtarantool-dev (but have tarantool-dev) packages, don't sure why and whether it is expected. Anyway it worth to move to 1.10. Updated .tarantoolctl to reflect box.cfg option names changes between 1.6 and 1.10. Updated text/multiversioning.test.py result file, but to be honest I don't sure what is the reason of SELECT statistics change. At least those values are the same before and after the test, so I guess they are correct. Part of #49.
1 parent ef58b9b commit 702d673

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
curl -s https://packagecloud.io/install/repositories/tarantool/1_6/script.deb.sh | sudo bash
4-
sudo apt-get install -y tarantool libtarantool-dev libevent-dev libsasl2-dev --force-yes
3+
curl -s https://packagecloud.io/install/repositories/tarantool/1_10/script.deb.sh | sudo bash
4+
sudo apt-get install -y tarantool tarantool-dev libevent-dev libsasl2-dev --force-yes
55
pip install --user python-daemon PyYAML six==1.9.0 msgpack-python gevent==1.1.2
66
TARANTOOL_DIR=/usr/include cmake . -DCMAKE_BUILD_TYPE=Release
77
make internalso libmemcached

test/.tarantoolctl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@ local workdir = os.getenv('TEST_WORKDIR')
55
default_cfg = {
66
pid_file = workdir,
77
wal_dir = workdir,
8-
snap_dir = workdir,
9-
logger = workdir,
8+
memtx_dir = workdir,
9+
vinyl_dir = workdir,
10+
log = workdir,
1011
background = false,
1112
}
1213

13-
if _TARANTOOL >= "1.7" then
14-
default_cfg.vinyl_dir = workdir
15-
end
16-
1714
instance_dir = workdir
1815

1916
-- vim: set ft=lua :

test/text/multiversioning.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ box.stat()
5656
total: 0
5757
rps: 0
5858
SELECT:
59-
total: 4
59+
total: 7
6060
rps: 0
6161
INSERT:
6262
total: 2

0 commit comments

Comments
 (0)