From 0e36cb3974955d46e2ec9fbb5267f1213efc269b Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen.haas@lakedrops.com> Date: Tue, 25 Jun 2024 10:51:41 +0200 Subject: [PATCH] Remove behat --- lakedrops.yml | 1 - test-and-deploy.yml | 3 +-- tests/lakedrops.yml | 30 ------------------------------ 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/lakedrops.yml b/lakedrops.yml index de40be2..c903917 100644 --- a/lakedrops.yml +++ b/lakedrops.yml @@ -4,7 +4,6 @@ variables: COMPOSER_PATCHES_SKIP_REPORTING: 1 DISABLE_CI_TESTS: 0 DISABLE_CI_TEST_BACKSTOP: 1 - DISABLE_CI_TEST_BEHAT: 0 DISABLE_CI_TEST_CODESTYLE: 1 DISABLE_CI_TEST_CYPRESSE2E: 1 DISABLE_CI_TEST_INVENTORY: 1 diff --git a/test-and-deploy.yml b/test-and-deploy.yml index 7b66e1f..1ca988c 100644 --- a/test-and-deploy.yml +++ b/test-and-deploy.yml @@ -165,7 +165,7 @@ Debug: elif [[ "$CI_COMMIT_MESSAGE" == *"Merge branch 'develop' into 'main'"* ]]; then TESTSDISABLED="yes" GITLABTESTSDISABLED="yes" - elif [[ "$DISABLE_CI_TEST_BACKSTOP" == "1" && "$DISABLE_CI_TEST_BEHAT" == "1" && "$DISABLE_CI_TEST_CYPRESSE2E" == "1" ]]; then + elif [[ "$DISABLE_CI_TEST_BACKSTOP" == "1" && "$DISABLE_CI_TEST_CYPRESSE2E" == "1" ]]; then echo "DB not required" elif [[ "$CI_COMMIT_REF_NAME" == "main" ]]; then DBREQUIRED="yes" @@ -354,7 +354,6 @@ Debug: - composer lakedrops:docker4drupal --no-interaction - docker compose pull --quiet - docker compose up -d --force-recreate --remove-orphans - - composer lakedrops:behat --no-interaction - mkdir -p files/default/files/css - mkdir -p files/default/files/js - mkdir -p files/default/files/languages diff --git a/tests/lakedrops.yml b/tests/lakedrops.yml index c82ac95..9d37670 100644 --- a/tests/lakedrops.yml +++ b/tests/lakedrops.yml @@ -55,32 +55,6 @@ Test PHPUnit: rules: - if: '$DISABLE_CI_TEST_PHPUNIT != "1"' -Test Behat: - <<: *test_lakedrops_default - <<: *test_lakedrops_theme - needs: - - job: Build Site - - job: Build Theme - artifacts: true - optional: true - - job: Import DB - optional: true - - job: Import DB NG - optional: true - - job: Import Local DB - optional: true - - job: Update DB - optional: true - script: - - ahoy behat exec -- --format junit --out /tmp/logs - artifacts: - name: behat - when: always - paths: - - logs/default.xml - rules: - - if: '$DISABLE_CI_TEST_BEHAT != "1"' - Test Backstop: <<: *test_lakedrops_default <<: *test_lakedrops_theme @@ -97,8 +71,6 @@ Test Backstop: optional: true - job: Update DB optional: true - - job: Test Behat - optional: true script: - backstop test retry: 2 @@ -126,8 +98,6 @@ Test Cypress E2E: optional: true - job: Update DB optional: true - - job: Test Behat - optional: true - job: Test Backstop optional: true resource_group: cypress -- GitLab