MOBILE-3294: Relay compose exit code and filter cron jobs

main
Noel De Martin 2020-06-16 17:32:05 +02:00
parent 5ebe8a647d
commit 7795e4921b
2 changed files with 6 additions and 4 deletions

View File

@ -43,11 +43,11 @@ jobs:
os: linux
script: npm run build --bailOnLintError true --typeCheckOnLint true
- stage: mirror
if: branch IN (master, integration, desktop) AND repo = moodlehq/moodleapp
if: branch IN (master, integration, desktop) AND repo = moodlehq/moodleapp AND type != cron
os: linux
script: scripts/mirror.sh
- stage: prepare
if: branch =~ /(master|^integration)$/ AND env(PREPARE) IS NOT blank AND env(PREPARE) = 1
if: branch =~ /(master|^integration)$/ AND env(PREPARE) IS NOT blank AND env(PREPARE) = 1 AND type != cron
os: linux
script: scripts/aot.sh
- stage: build

View File

@ -41,14 +41,16 @@ $dockercompose pull
$dockercompose up -d
$dockerscripts/moodle-docker-wait-for-db
$dockerscripts/moodle-docker-wait-for-app
$dockercompose exec -T webserver php admin/tool/behat/cli/init.php
$dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/init.php"
notify_on_error_exit "e2e failed initializing behat"
# Run tests
for tags in "$@"
do
print_title "Running e2e tests ($tags)"
$dockercompose exec -T webserver php admin/tool/behat/cli/run.php --tags="$tags"
$dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --tags=\"$tags\""
notify_on_error_exit "e2e failed on $tags"
done