Skip to content

Commit ddcf29c

Browse files
Merge branch 'master' into get-node-list-from-nodes
2 parents 494be4a + debe676 commit ddcf29c

File tree

3 files changed

+17
-20
lines changed

3 files changed

+17
-20
lines changed

.travis.yml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,15 @@ env:
1010
- TARGET=test
1111
- OS=el DIST=6
1212
- OS=el DIST=7
13-
- OS=fedora DIST=24
14-
- OS=fedora DIST=25
15-
- OS=ubuntu DIST=precise
13+
- OS=fedora DIST=28
14+
- OS=fedora DIST=29
1615
- OS=ubuntu DIST=trusty
1716
- OS=ubuntu DIST=xenial
18-
# - OS=debian DIST=wheezy
17+
- OS=ubuntu DIST=bionic
18+
- OS=ubuntu DIST=disco
1919
- OS=debian DIST=jessie
2020
- OS=debian DIST=stretch
21-
22-
matrix:
23-
allow_failures:
24-
# - env: OS=el DIST=6
25-
# - env: OS=el DIST=7
26-
# - env: OS=fedora DIST=24
27-
# - env: OS=fedora DIST=25
28-
# - env: OS=ubuntu DIST=precise
29-
# - env: OS=ubuntu DIST=trusty
30-
# - env: OS=ubuntu DIST=xenial
31-
# - env: OS=ubuntu DIST=yakkety
32-
# - env: OS=debian DIST=wheezy
33-
# - env: OS=debian DIST=jessie
34-
# - env: OS=debian DIST=stretch
21+
- OS=debian DIST=buster
3522

3623
script:
3724
- git describe --long
@@ -100,6 +87,16 @@ deploy:
10087
on:
10188
branch: master
10289
condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
90+
- provider: packagecloud
91+
username: tarantool
92+
repository: "2_2"
93+
token: ${PACKAGECLOUD_TOKEN}
94+
dist: ${OS}/${DIST}
95+
package_glob: build/*.{rpm,deb}
96+
skip_cleanup: true
97+
on:
98+
branch: master
99+
condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
103100

104101
notifications:
105102
email:

test/cluster-py/multi.test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def check_connection(con):
4242
# Make a list of servers
4343
sources = []
4444
for server in cluster[1:]:
45-
sources.append(yaml.load(server.admin('box.cfg.listen', silent=True))[0])
45+
sources.append(yaml.safe_load(server.admin('box.cfg.listen', silent=True))[0])
4646

4747
addrs = []
4848
for addr in sources:

unit/suites/lib/tarantool_admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ def execute(self, command):
6161
if (res.rfind("\n...\n") >= 0 or res.rfind("\r\n...\r\n") >= 0):
6262
break
6363

64-
return yaml.load(res, yaml.FullLoader)
64+
return yaml.safe_load(res)

0 commit comments

Comments
 (0)