Merge pull request #1793 from acquia/ACMS-3649

ACMS-3649: Patch orca to remove local setting in case of DRS.
acquia · Mar 28, 2024 · e254a9a · e254a9a
2 parents ed688dd + 549cd63
commit e254a9a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml
@@ -53,6 +53,7 @@ jobs:
           composer self-update
           composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
           curl https://gist.githubusercontent.com/vishalkhode1/0e26b2e9637722a256c74a6cb8496e9d/raw/sut-path-reposories.patch | git -C ../orca apply
+          curl https://gist.githubusercontent.com/chandan-singh7929/902a17bbf0f5c0e0ee536dd5983875f3/raw/4031ae76ca5e8f08b98545bfdcda327f6d38be58/remove-local-settings.patch | git -C ../orca apply
       - name: Before Install
         run: |
           # Added below in CI to test acquia_cms on Drupal Core >=9.5.
@@ -154,6 +155,7 @@ jobs:
           composer self-update
           composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
           curl https://gist.githubusercontent.com/vishalkhode1/0e26b2e9637722a256c74a6cb8496e9d/raw/sut-path-reposories.patch | git -C ../orca apply
+          curl https://gist.githubusercontent.com/chandan-singh7929/902a17bbf0f5c0e0ee536dd5983875f3/raw/4031ae76ca5e8f08b98545bfdcda327f6d38be58/remove-local-settings.patch | git -C ../orca apply
       # - name: Configure AWS Credentials
       #   uses: aws-actions/configure-aws-credentials@v1
       #   with:
@@ -217,14 +219,15 @@ jobs:
       ORCA_SUT_DIR: /home/runner/work/acquia_cms/acquia_cms
       COMPOSER_PROCESS_TIMEOUT: 1800
       ORCA_JOB: ${{ matrix.orca-job }}
-      # AWS_S3_BUCKET_PATH: s3://acquia-cms-artifacts/backstop
+      AWS_S3_BUCKET_PATH: s3://acquia-cms-artifacts/backstop
       # Set Required API Keys.
       CONNECTOR_ID: ${{ secrets.CONNECTOR_ID }}
       SEARCH_UUID: ${{ secrets.SEARCH_UUID }}
       CONNECTOR_KEY: ${{ secrets.CONNECTOR_KEY }}
       GMAPS_KEY: ${{ secrets.GMAPS_KEY }}
       SITESTUDIO_API_KEY: ${{ secrets.SITESTUDIO_API_KEY }}
       SITESTUDIO_ORG_KEY: ${{ secrets.SITESTUDIO_ORG_KEY }}
+      COPY_BACKSTOP_IMAGES: false
       ACMS_JOB: "backstop_tests"
       JOB_TYPE: "integrated-tests"
       CI: true
@@ -257,12 +260,12 @@ jobs:
           composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
           curl https://gist.githubusercontent.com/vishalkhode1/0e26b2e9637722a256c74a6cb8496e9d/raw/sut-path-reposories.patch | git -C ../orca apply
           curl https://gist.githubusercontent.com/vishalkhode1/342a0eee801e51f48b4d9701749c1c94/raw/orca-oldest-support.patch | git -C ../orca apply
-      # - name: Configure AWS Credentials
-      #   uses: aws-actions/configure-aws-credentials@v1
-      #   with:
-      #     aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      #     aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      #     aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
       - name: Before Install
         run: |
           # Added below in CI to test acquia_cms on Drupal Core >=9.5.
@@ -349,6 +352,7 @@ jobs:
           composer self-update
           composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
           curl https://gist.githubusercontent.com/vishalkhode1/0e26b2e9637722a256c74a6cb8496e9d/raw/sut-path-reposories.patch | git -C ../orca apply
+          curl https://gist.githubusercontent.com/chandan-singh7929/902a17bbf0f5c0e0ee536dd5983875f3/raw/4031ae76ca5e8f08b98545bfdcda327f6d38be58/remove-local-settings.patch | git -C ../orca apply
       - name: Before Install
         run: |
           # Added below in CI to test acquia_cms on Drupal Core >=9.5.

diff --git a/tests/ci/script.sh b/tests/ci/script.sh
@@ -30,22 +30,19 @@ if [ "${ACMS_JOB}" == "backstop_tests" ] || [ "${ACMS_JOB}" == "upgrade_modules"
   orca fixture:run-server &
 
   # Runs Backstop.js
-  npm run backstop-starter
-
-  # Generate backstop test images.
-  # npm run backstop-starter && error=false || error=true
-  # if [ "${error}" = "true" ]; then
-  #   ./node_modules/.bin/backstop reference --config=tests/backstop/backstop-settings.js
-  #   ./node_modules/.bin/backstop approve --config=tests/backstop/backstop-settings.js
-  #   aws s3 cp --recursive "./tests/backstop/bitmaps_reference/" "${AWS_S3_BUCKET_PATH}/backstop/reference/${GITHUB_RUN_ID}"
-  # fi
-
-  # Store failed backstop test images.
-  # npm run backstop-starter && error=false || error=true
-  # if [ "${error}" = "true" ]; then
-  #    tar -cvzf test_reports.tar.gz ./tests/backstop/bitmaps_test/;
-  #    aws s3 cp --recursive "./tests/backstop/bitmaps_test/" "${AWS_S3_BUCKET_PATH}/backstop/logs/${GITHUB_RUN_ID}"
-  # fi
+  npm run backstop-starter && error=false || error=true
+  if [ "${error}" = "true" ]; then
+    if [ "${COPY_BACKSTOP_IMAGES}" == "true" ]; then
+      tar -cvzf test_reports.tar.gz ./tests/backstop/bitmaps_test/;
+      aws s3 cp --recursive "./tests/backstop/bitmaps_test/" "${AWS_S3_BUCKET_PATH}/backstop/logs/${GITHUB_RUN_ID}"
+
+      # Uncomment below to Generate backstop test images & copy in AWS.
+      # ./node_modules/.bin/backstop reference --config=tests/backstop/backstop-settings.js
+      # ./node_modules/.bin/backstop approve --config=tests/backstop/backstop-settings.js
+      # aws s3 cp --recursive "./tests/backstop/bitmaps_reference/" "${AWS_S3_BUCKET_PATH}/backstop/reference/${GITHUB_RUN_ID}"
+    fi
+    exit 1
+  fi
   # Runs Pa11y.js
   # npm run pa11y-starter
 fi