Skip to content

Commit 0f1a99c

Browse files
ACMS-3473: Update cypress test in cron.
1 parent 29d7fd0 commit 0f1a99c

File tree

2 files changed

+2
-123
lines changed

2 files changed

+2
-123
lines changed

.github/workflows/acquia_cms_ci.workflow.yml

-122
Original file line numberDiff line numberDiff line change
@@ -494,128 +494,6 @@ jobs:
494494
./vendor/bin/drush cr
495495
cd ${ORCA_SUT_DIR}
496496
./tests/ci/script.sh
497-
cypress_tests:
498-
name: Cypress Tests with ${{ matrix.orca-job }} on PHP ${{ matrix.php-version }}
499-
runs-on: ubuntu-latest
500-
env:
501-
ORCA_SUT_NAME: acquia/acquia_cms
502-
ORCA_SUT_BRANCH: develop
503-
ORCA_VERSION: ${{ matrix.orca-version }}
504-
ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml
505-
ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project
506-
ORCA_ENABLE_NIGHTWATCH: "FALSE"
507-
ORCA_PHPCS_STANDARD: AcquiaPHP
508-
ORCA_SUT_DIR: /home/runner/work/acquia_cms/acquia_cms
509-
COMPOSER_PROCESS_TIMEOUT: 1800
510-
ORCA_JOB: ${{ matrix.orca-job }}
511-
CONNECTOR_ID: ${{ secrets.CONNECTOR_ID }}
512-
GMAPS_KEY: ${{ secrets.GMAPS_KEY }}
513-
SEARCH_UUID: ${{ secrets.SEARCH_UUID }}
514-
SITESTUDIO_API_KEY: ${{ secrets.SITESTUDIO_API_KEY }}
515-
SITESTUDIO_ORG_KEY: ${{ secrets.SITESTUDIO_ORG_KEY }}
516-
ACMS_JOB: "cypress_tests"
517-
JOB_TYPE: "integrated-tests"
518-
CI: true
519-
strategy:
520-
fail-fast: false
521-
matrix:
522-
orca-job:
523-
- ISOLATED_TEST_ON_CURRENT
524-
- INTEGRATED_TEST_ON_LATEST_LTS
525-
php-version:
526-
- 7.4
527-
- 8.1
528-
- 8.2
529-
orca-version:
530-
- ^3
531-
- ^4
532-
exclude:
533-
- orca-job: ISOLATED_TEST_ON_CURRENT
534-
orca-version: ^3
535-
php-version: 7.4
536-
- orca-job: ISOLATED_TEST_ON_CURRENT
537-
orca-version: ^3
538-
php-version: 8.1
539-
- orca-job: ISOLATED_TEST_ON_CURRENT
540-
orca-version: ^3
541-
php-version: 8.2
542-
- orca-job: ISOLATED_TEST_ON_CURRENT
543-
orca-version: ^4
544-
php-version: 7.4
545-
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
546-
orca-version: ^3
547-
php-version: 8.1
548-
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
549-
orca-version: ^3
550-
php-version: 8.2
551-
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
552-
orca-version: ^4
553-
php-version: 7.4
554-
steps:
555-
- uses: actions/checkout@v3
556-
- name: Use Node.js 12.13.1
557-
uses: actions/setup-node@v3
558-
with:
559-
node-version: 12.13.1
560-
- uses: shivammathur/setup-php@v2
561-
with:
562-
php-version: ${{ matrix.php-version }}
563-
#coverage: xdebug
564-
- name: Setup MySQL
565-
run: |
566-
sudo /etc/init.d/mysql start
567-
mysql -uroot -proot < ./tests/ci/install.sql
568-
- name: Download ORCA
569-
run: |
570-
composer self-update
571-
composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
572-
curl https://gist.githubusercontent.com/vishalkhode1/0e26b2e9637722a256c74a6cb8496e9d/raw/sut-path-reposories.patch | git -C ../orca apply
573-
curl https://gist.githubusercontent.com/vishalkhode1/342a0eee801e51f48b4d9701749c1c94/raw/orca-oldest-support.patch | git -C ../orca apply
574-
- name: Before Install
575-
run: |
576-
# Added below in CI to test acquia_cms on Drupal Core >=9.5.
577-
composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
578-
sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
579-
580-
# Remove all PHPunit tests from acquia_cms modules.
581-
find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';'
582-
583-
# Remove the failing php on Drupal Core 9.5.
584-
if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_LATEST_LTS" ]; then
585-
# NEW_JSON=$(composer config extra.patches."drupal/core" | sed -r 's/,?"3328187.*3142.patch"//')
586-
587-
# Remove drupal/core patch as it's needed for latest Drupal Core only.
588-
composer config extra.patches.drupal/core {} --json
589-
sed -i 's/2598.patch",/2598.patch"/' modules/acquia_cms_common/composer.json
590-
sed -i '/3356894-mr_3896.patch/d' modules/acquia_cms_common/composer.json
591-
sed -i '/3370946-pagetitle-backport-10-2-x.patch/d' modules/acquia_cms_common/composer.json
592-
# Change requireSameDimensions to true in backstop settings.
593-
sed -i '54s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
594-
sed -i '111s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
595-
sed -i '130s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
596-
sed -i '149s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
597-
sed -i '168s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
598-
sed -i '187s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
599-
fi
600-
../orca/bin/ci/before_install.sh
601-
chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 &
602-
CHROMEDRIVER_PID=$!
603-
echo "CHROMEDRIVER_PID=${CHROMEDRIVER_PID}" >> ${GITHUB_ENV}
604-
- name: Install
605-
shell: 'script -q -e -c "bash {0}"'
606-
run: ./tests/ci/install.sh
607-
- name: Before script
608-
run: ../orca/bin/ci/before_script.sh
609-
- name: Script
610-
run: ./tests/ci/script.sh
611-
- name: Before Cache
612-
run: ../orca/bin/ci/before_cache.sh
613-
- name: After script
614-
run: |
615-
kill -0 ${{ env.CHROMEDRIVER_PID }}
616-
../orca/bin/ci/after_success.sh
617-
../orca/bin/ci/after_failure.sh
618-
../orca/bin/ci/after_script.sh
619497
deploy_code:
620498
if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
621499
name: "Continuous Deployment (CD)"

.github/workflows/acquia_cms_cron.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,9 @@ jobs:
386386
387387
# Remove drupal/core patch as it's needed for latest Drupal Core only.
388388
composer config extra.patches.drupal/core {} --json
389-
sed -i 's/2598.patch",/2599.patch"/' modules/acquia_cms_common/composer.json
389+
sed -i 's/2598.patch",/2598.patch"/' modules/acquia_cms_common/composer.json
390390
sed -i '/3356894-mr_3896.patch/d' modules/acquia_cms_common/composer.json
391+
sed -i '/3370946-page-title-backport-10-2-2_0.patch/d' modules/acquia_cms_common/composer.json
391392
# Change requireSameDimensions to true in backstop settings.
392393
sed -i '54s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
393394
sed -i '111s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js

0 commit comments

Comments
 (0)