Merge pull request #1904 from acquia/ACMS-4288

ACMS-4288: Fix GitLab CI pipelines of Drupal Starter Kit Modules.

modules/acquia_cms_component/.gitlab-ci.yml

@@ -18,3 +18,5 @@ variables:
   # Coverage report
   ORCA_SUT_DIR: "$CI_PROJECT_DIR/../acquia_cms_component"
   ORCA_JUNIT_LOG: "$CI_PROJECT_DIR/var/logs/junit.xml"
+  # Exclude the code coverage, as tests have not been written yet.
+  SKIP_ISOLATED_TEST_ON_CURRENT_COVERAGE_PHP83: 1

modules/acquia_cms_headless/.gitlab-ci.yml

@@ -21,4 +21,3 @@ variables:
 
   COMPOSER_PATCHES_FILE: $CI_PROJECT_DIR/.gitlab-ci/patches/patches.json
   SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR: 1
-  SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR_PHP8: 1

modules/acquia_cms_headless/tests/src/Traits/HeadlessNextJsTrait.php

@@ -66,11 +66,15 @@ protected function assertNextJsEntityTypeConfigure(): void {
     $assert = $this->assertSession();
     $page = $this->getSession()->getPage();
     $this->drupalGet("admin/config/services/next/entity-types/add");
-    $assert->selectExists('id')->selectOption('node.test');
-    $assert->waitForElementVisible('css', '.settings-container');
+    $assert->selectExists('Entity type')->selectOption('node.test');
     $this->assertTrue($assert->optionExists('id', 'node.test')->isSelected());
+    $assert->buttonExists('Save')->press();
+    $this->drupalGet("admin/config/services/next/entity-types/node.test/edit");
+    $assert->waitForText('Settings');
+    $assert->waitForText('Configure draft mode for this entity type.');
     $assert->selectExists('site_resolver')->selectOption('site_selector');
     $assert->assertWaitOnAjaxRequest();
+    $assert->buttonExists('Save')->press();
     $assert->waitForText('Next.js sites');
     $this->assertTrue($assert->optionExists('site_resolver', 'site_selector')->isSelected());
     $page->checkField('sites[headless_site_one]');

modules/acquia_cms_site_studio/.gitlab-ci.yml

@@ -22,12 +22,8 @@ variables:
 
   # Site Studio 8.0.x doesn't support 9.5.x, hence skipping 9.5.x CI jobs now
   SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR: 1
-  SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR_PHP8: 1
 
 # Do not add patch for latest EOL Major i.e 9.5.x as it's working as expected.
 INTEGRATED_TEST_ON_LATEST_EOL_MAJOR:
   variables:
     COMPOSER_PATCHES_FILE: ""
-INTEGRATED_TEST_ON_LATEST_EOL_MAJOR_PHP8:
-  variables:
-    COMPOSER_PATCHES_FILE: ""