From 681b33fd5edbfcac9e35531cf89eab7c23f936a3 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 29 Jun 2022 12:55:06 +0200 Subject: [PATCH] MOBILE-4110 e2e: Remove deprecated travis jobs --- .travis.yml | 18 ---------------- scripts/test_e2e.sh | 50 --------------------------------------------- 2 files changed, 68 deletions(-) delete mode 100755 scripts/test_e2e.sh diff --git a/.travis.yml b/.travis.yml index 591f20841..4232f486c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,21 +68,3 @@ jobs: homebrew: packages: - jq - - stage: test - name: "End to end tests (mod_forum and mod_messages)" - services: - - docker - if: type = cron - script: scripts/test_e2e.sh "@app&&@mod_forum" "@app&&@mod_messages" - - stage: test - name: "End to end tests (mod_course, core_course and mod_courses)" - services: - - docker - if: type = cron - script: scripts/test_e2e.sh "@app&&@mod_course" "@app&&@core_course" "@app&&@mod_courses" - - stage: test - name: "End to end tests (others)" - services: - - docker - if: type = cron - script: scripts/test_e2e.sh "@app&&~@mod_forum&&~@mod_messages&&~@mod_course&&~@core_course&&~@mod_courses" diff --git a/scripts/test_e2e.sh b/scripts/test_e2e.sh deleted file mode 100755 index 6e363aa24..000000000 --- a/scripts/test_e2e.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -source "scripts/functions.sh" - -# Prepare variables -basedir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )" -dockerscripts="$HOME/moodle-docker/bin/" -dockercompose="$dockerscripts/moodle-docker-compose" - -export MOODLE_DOCKER_DB=pgsql -export MOODLE_DOCKER_BROWSER=chrome -export MOODLE_DOCKER_WWWROOT="$HOME/moodle" -export MOODLE_DOCKER_PHP_VERSION=7.4 -export MOODLE_DOCKER_APP_PATH=$basedir - -# Prepare dependencies -print_title "Preparing dependencies" -git clone --branch master --depth 1 git://github.com/moodle/moodle $HOME/moodle -git clone --branch ionic5 --depth 1 git://github.com/moodlehq/moodle-local_moodlemobileapp $HOME/moodle/local/moodlemobileapp - -# TODO replace for moodlehq/moodle-docker after merging https://github.com/moodlehq/moodle-docker/pull/156 -git clone --branch MOBILE-3738 --depth 1 git://github.com/NoelDeMartin/moodle-docker $HOME/moodle-docker - -cp $HOME/moodle-docker/config.docker-template.php $HOME/moodle/config.php - -# Build app -print_title "Building app" -npm ci - -# Start containers -print_title "Starting containers" -$dockercompose pull -$dockercompose up -d -$dockerscripts/moodle-docker-wait-for-db -$dockerscripts/moodle-docker-wait-for-app - -$dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/init.php" -notify_on_error_exit "e2e failed initializing behat" - -print_title "Running e2e tests" - -# Run tests -for tags in "$@" -do - $dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --tags=\"$tags\" --auto-rerun" - notify_on_error_exit "Some e2e tests are failing, please review" -done - -# Clean up -$dockercompose down