Verified Commit 89b19310 authored by Dave Long's avatar Dave Long
Browse files

Issue #3411921 by catch: Start FunctionalJavaScript tests before Functional tests 

(cherry picked from commit b7f45944)
parent 012776a0

.gitlab-ci/pipeline.yml

+18 −18
Original line number Diff line number Diff line
@@ -112,15 +112,6 @@ variables: 
# Documentation: https://docs.gitlab.com/ee/ci/jobs/

################



'🌐️️ PHPUnit Functional':

  <<: [ *with-composer, *run-tests, *default-job-settings ]

  parallel: 7

  variables:

    TESTSUITE: PHPUnit-Functional

    KUBERNETES_CPU_REQUEST: "24"

  services:

    - <<: *with-database



'🩹 Test-only changes':

  <<: [ *with-composer, *default-job-settings ]

  when: manual
@@ -131,15 +122,6 @@ variables: 
  script:

    - $CI_PROJECT_DIR/.gitlab-ci/scripts/test-only.sh



'⚙️️ PHPUnit Kernel':

  <<: [ *with-composer, *run-tests, *default-job-settings ]

  parallel: 2

  variables:

    TESTSUITE: PHPUnit-Kernel

    KUBERNETES_CPU_REQUEST: "16"

  services:

    - <<: *with-database



'🖱️️️ PHPUnit Functional Javascript':

  <<: [ *with-composer, *run-tests, *default-job-settings ]

  parallel: 2
@@ -154,6 +136,24 @@ variables: 
    - sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true

    - cp /builds/chromedriver.log ./



'🌐️️ PHPUnit Functional':

  <<: [ *with-composer, *run-tests, *default-job-settings ]

  parallel: 7

  variables:

    TESTSUITE: PHPUnit-Functional

    KUBERNETES_CPU_REQUEST: "24"

  services:

    - <<: *with-database



'⚙️️ PHPUnit Kernel':

  <<: [ *with-composer, *run-tests, *default-job-settings ]

  parallel: 2

  variables:

    TESTSUITE: PHPUnit-Kernel

    KUBERNETES_CPU_REQUEST: "16"

  services:

    - <<: *with-database



'👷️️️ PHPUnit Build':

  <<: [ *with-composer, *run-tests, *default-job-settings ]

  variables: