Skip to content
Permalink
Browse files

plop

  • Loading branch information
3nids committed Mar 7, 2019
1 parent 6304cf5 commit 64195d5bc09f3b80071afc993d329fc6fc0ff61f
@@ -19,10 +19,6 @@ services:
links:
- postgres
- mssql
environment:
- TRAVIS_UPLOAD_TIME=${TRAVIS_UPLOAD_TIME}
- TRAVIS_BRANCH=${TRAVIS_BRANCH}
- TRAVIS_OS_NAME=${TRAVIS_OS_NAME}
- TRAVIS_CONFIG=${TRAVIS_CONFIG}
- TRAVIS=${TRAVIS}
- QGIS_NO_OVERRIDE_IMPORT=1
env_file:
- docker-variables.env

@@ -0,0 +1,13 @@

# Env variables for Docker
# These without assignment are taken from the host env variabbles

# TRAVIS variables
TRAVIS_UPLOAD_TIME
TRAVIS_BRANCH
TRAVIS_OS_NAME
TRAVIS_CONFIG
TRAVIS

# Other var
QGIS_NO_OVERRIDE_IMPORT=1
@@ -19,20 +19,16 @@ set -e
# build QGIS in docker
docker run -t --name qgis_container \
-v ${TRAVIS_BUILD_DIR}:/root/QGIS \
-v ${CCACHE_DIR}:/root/.ccache qgis/qgis3-build-deps:${DOCKER_TAG} \
-e "TRAVIS_UPLOAD_TIME=${TRAVIS_UPLOAD_TIME}" \
-e "TRAVIS_BRANCH=${TRAVIS_BRANCH}" \
-e "TRAVIS_OS_NAME=${TRAVIS_OS_NAME}" \
-e "TRAVIS_CONFIG=${TRAVIS_CONFIG}" \
-e "TRAVIS=${TRAVIS}" \
-e "QGIS_NO_OVERRIDE_IMPORT=1" \
-v ${CCACHE_DIR}:/root/.ccache \
--env-file {TRAVIS_BUILD_DIR}/.ci/travis/linux/docker-variables.env \
qgis/qgis3-build-deps:${DOCKER_TAG} \
/root/QGIS/.ci/travis/linux/scripts/docker-qgis-build.sh

# commit container
docker commit qgis_container qgis_image

# running QGIS tests in commited image
docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml run qgis-deps /root/QGIS/.ci/travis/linux/scripts/docker-qgis-test.sh
docker-compose -f {TRAVIS_BUILD_DIR}/.ci/travis/linux/docker-compose.travis.yml run qgis-deps /root/QGIS/.ci/travis/linux/scripts/docker-qgis-test.sh

# running tests for the python test runner
docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR}/tests/src/python:/tests_directory -e DISPLAY=:99 qgis_image "/usr/bin/supervisord -c /etc/supervisor/supervisord.conf"

0 comments on commit 64195d5

Please sign in to comment.
You can’t perform that action at this time.