remove left over

3nids · 3nids · commit d131a57c9705 · 2018-11-16T22:01:44.000+01:00
diff --git a/.ci/travis/linux/before_script.sh b/.ci/travis/linux/before_script.sh
@@ -18,14 +18,8 @@ set -e
 
 pushd .docker
 
-source $(git rev-parse --show-toplevel)/.ci/travis/scripts/travis_envvar_helper.sh
-
-
 DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ push ]] && echo "true" || echo "false" )
 DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
-# on cron job, QGIS image is built and push without testing
-DOCKER_QGIS_IMAGE_BUILD_PUSH=$(create_qgis_image)
-
 
 echo "travis_fold:start:travis_env"
 echo "${bold}Travis environment variables${endbold}"
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -16,13 +16,10 @@
 
 set -e
 
-source $(git rev-parse --show-toplevel)/.ci/travis/scripts/travis_envvar_helper.sh
-
-DOCKER_QGIS_IMAGE_BUILD_PUSH=$(create_qgis_image)
-
 mkdir -p "$CCACHE_DIR"
 
 if [[ DOCKER_BUILD_QGIS_IMAGE =~ true ]]; then
+  # building docker images
   DIR=$(git rev-parse --show-toplevel)/.docker
   pushd "${DIR}"
   echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}"
@@ -36,5 +33,6 @@ if [[ DOCKER_BUILD_QGIS_IMAGE =~ true ]]; then
   docker push "qgis/qgis:${DOCKER_TAG}"
   popd
 else
+  # running tests
   docker-compose -f "${DOCKER_COMPOSE}" run --rm qgis-deps
 fi
