Skip to content

Commit 8d9fb39

Browse files
authored
Use ubuntu/bionic64/python-driver bionic image on jenkins (datastax#974)
1 parent e0e003f commit 8d9fb39

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

build.yaml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ python:
9999
- 3.6
100100

101101
os:
102-
- ubuntu/trusty64
102+
- ubuntu/bionic64/python-driver
103103

104104
cassandra:
105105
- '2.1'
@@ -122,9 +122,7 @@ build:
122122
pip install --upgrade pip
123123
pip install -U setuptools
124124
125-
pip install git+https://github.com/pcmanus/ccm.git
126-
# Install dependencies
127-
sudo apt-get install -y libev4 libev-dev libssl-dev
125+
pip install git+https://github.com/riptano/ccm.git
128126
129127
pip install -r test-requirements.txt
130128
pip install nose-ignore-docstring
@@ -143,15 +141,6 @@ build:
143141
python setup.py build_ext --inplace --no-cython
144142
fi
145143
146-
echo "Installing simulacron"
147-
pushd ~
148-
149-
SIMULACRON_JAR=`find \`pwd\` -name "simulacron-standalone-*.jar"`
150-
echo "SIMULACRON_JAR: $SIMULACRON_JAR"
151-
152-
popd
153-
154-
155144
echo "JUST_UPGRADE: $JUST_UPGRADE"
156145
if [[ $JUST_UPGRADE == 'True' ]]; then
157146
EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=upgrade_results.xml tests/integration/upgrade || true
@@ -170,6 +159,7 @@ build:
170159
171160
echo "Running with event loop manager: $EVENT_LOOP_MANAGER"
172161
echo "==========RUNNING SIMULACRON TESTS=========="
162+
SIMULACRON_JAR="$HOME/simulacron.jar"
173163
SIMULACRON_JAR=$SIMULACRON_JAR EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CASSANDRA_DIR=$CCM_INSTALL_DIR DSE_VERSION=$CCM_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=simulacron_results.xml tests/integration/simulacron/ || true
174164
175165
echo "Running with event loop manager: $EVENT_LOOP_MANAGER"

tests/unit/io/test_asyncioreactor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import asynctest
44
ASYNCIO_AVAILABLE = True
55
except (ImportError, SyntaxError):
6-
AysncioConnection = None
6+
AsyncioConnection = None
77
ASYNCIO_AVAILABLE = False
88

99
from tests import is_monkey_patched, connection_class

0 commit comments

Comments
 (0)