summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rwxr-xr-x.travis_run_task.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2e60e292f..4f36b82cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: python
services:
- docker
+python:
+ - "2.7"
cache: pip
env:
global:
diff --git a/.travis_run_task.sh b/.travis_run_task.sh
index 2163a9b71..4eb78c9c6 100755
--- a/.travis_run_task.sh
+++ b/.travis_run_task.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# NOTE: this script is intended to run in Travis CI only
-set -ev
+PYTHON="/usr/bin/python${TRAVIS_PYTHON_VERSION}"
test_set=""
developer_mode_opt="--developer-mode"
@@ -29,6 +29,7 @@ docker pull $TEST_RUNNER_IMAGE
ipa-docker-test-runner -l $CI_RESULTS_LOG \
-c $TEST_RUNNER_CONFIG \
$developer_mode_opt \
+ --container-environment "PYTHON=$PYTHON" \
--container-image $TEST_RUNNER_IMAGE \
--git-repo $TRAVIS_BUILD_DIR \
$TASK_TO_RUN $test_set