Skip to content

Commit e104cce

Browse files
committed
gogogogog
1 parent fe0c6d9 commit e104cce

File tree

2 files changed

+57
-4
lines changed

2 files changed

+57
-4
lines changed

.ci/travis/linux/script.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ docker run -t --name qgis_container \
3030
docker commit qgis_container qgis_image
3131
echo "travis_fold:end:docker_build_qgis"
3232

33-
#docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" || true
34-
#docker tag qgis_image qgis/qgis:travis_testing || true
35-
#docker push qgis/qgis:travis_testing || true
36-
3733
# running QGIS tests in commited image
3834
echo "travis_fold:start:docker_test_qgis"
3935
echo "${bold}Docker run tests${endbold}"
@@ -45,6 +41,10 @@ echo "travis_fold:start:docker_test_runners"
4541
echo "${bold}Docker test QGIS runners${endbold}"
4642
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
4743

44+
docker cp ${TRAVIS_BUILD_DIR}/.docker/qgis_resources/test_runner/. qgis-testing-environment:/usr/bin/
45+
docker cp ${TRAVIS_BUILD_DIR}/.docker/qgis_resources/supervisor/supervisord.conf qgis-testing-environment:/etc/supervisor/
46+
docker cp ${TRAVIS_BUILD_DIR}/.docker/qgis_resources/supervisor/supervisor.xvfb.conf qgis-testing-environment:/etc/supervisor/supervisor.d/
47+
4848
echo "Waiting for the docker..."
4949
until [ "`/usr/bin/docker inspect -f {{.State.Running}} qgis-testing-environment`"=="true" ]; do
5050
printf '🐳'
@@ -70,4 +70,5 @@ do
7070
[[ $? -eq "${testrunners[$i]}" ]] && echo "success" || exit 1
7171
echo "travis_fold:end:docker_test_runner_${i}"
7272
done
73+
docker stop qgis-testing-environment
7374
echo "travis_fold:end:docker_test_runners"

docker.sh

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#!/usr/bin/env bash
2+
3+
4+
export TRAVIS_AVAILABLE_TIME=1000000000000000000
5+
export TRAVIS_TIMESTAMP=100000
6+
export TRAVIS_UPLOAD_TIME=0
7+
export TRAVIS_BRANCH=master
8+
export TRAVIS_PULL_REQUEST=
9+
export TRAVIS_OS_NAME=linux
10+
export TRAVIS_CONFIG=linux
11+
export TRAVIS
12+
13+
export DOCKER_TAG=latest
14+
export CCACHE_DIR=/tmp/ccache
15+
16+
export TRAVIS_BUILD_DIR=~/opt/qgis/QGIS
17+
18+
19+
docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR}/tests/src/python:/tests_directory -e DISPLAY=:99 qgis/qgis /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
20+
21+
docker cp ${TRAVIS_BUILD_DIR}/.docker/qgis_resources/test_runner/. qgis-testing-environment:/usr/bin/
22+
docker cp ${TRAVIS_BUILD_DIR}/.docker/qgis_resources/supervisor/supervisord.conf qgis-testing-environment:/etc/supervisor/
23+
docker cp ${TRAVIS_BUILD_DIR}/.docker/qgis_resources/supervisor/supervisor.xvfb.conf qgis-testing-environment:/etc/supervisor/supervisor.d/
24+
25+
26+
echo "Waiting for the docker..."
27+
until [ "`docker inspect -f {{.State.Running}} qgis-testing-environment`"=="true" ]; do
28+
printf '🐳'
29+
sleep 0.5;
30+
done;
31+
echo " done 🥩"
32+
sleep 1 # Wait for xvfb to finish starting
33+
34+
declare -A testrunners
35+
# Passing cases:
36+
testrunners["test_testrunner.run_passing"]=0
37+
testrunners["test_testrunner.run_skipped_and_passing"]=0
38+
# Failing cases:
39+
testrunners["test_testrunner"]=1
40+
testrunners["test_testrunner.run_all"]=1
41+
testrunners["test_testrunner.run_failing"]=1
42+
# Run tests in the docker
43+
for i in "${!testrunners[@]}"
44+
do
45+
echo "travis_fold:start:docker_test_runner_${i}"
46+
echo "test ${i}..."
47+
docker exec -it qgis-testing-environment sh -c "cd /tests_directory && qgis_testrunner.sh ${i}"
48+
[[ $? -eq "${testrunners[$i]}" ]] && echo "success" || exit 1
49+
echo "travis_fold:end:docker_test_runner_${i}"
50+
done
51+
docker stop qgis-testing-environment
52+
echo "travis_fold:end:docker_test_runners"

0 commit comments

Comments
 (0)