Issue #3398321 by bbrala, catch, Gauravvvv, BramDriesen: Optimize GitLab resource requests phase 1 (457663eb) · Commits · project / drupal

.gitlab-ci.yml

+23 −3

Original line number	Diff line number	Diff line
		@@ -48,6 +48,9 @@ variables:
		CONCURRENCY: 32
		GIT_DEPTH: "3"

		.default-lint-variables: &default-lint-variables
		_TARGET_PHP: "8.2"
		_TARGET_DB: "sqlite-3"

		#############
		# Stages #
		@@ -72,9 +75,6 @@ stages:
		- stuck_or_timeout_failure
		- runner_system_failure
		- scheduler_failure
		variables:
		_TARGET_PHP: "8.2"
		_TARGET_DB: "sqlite-3"
		image:
		name: $_CONFIG_DOCKERHUB_ROOT/php-$_TARGET_PHP-apache:production
		rules:
		@@ -226,6 +226,9 @@ stages:

		'📦️ Composer':
		<<: *default-job-settings-lint
		variables:
		<<: *default-lint-variables
		KUBERNETES_CPU_REQUEST: "1"
		stage: 🏗️ Build
		cache:
		<<: *composer-cache
		@@ -240,6 +243,9 @@ stages:

		'📦️ Yarn':
		<<: *default-job-settings-lint
		variables:
		<<: *default-lint-variables
		KUBERNETES_CPU_REQUEST: "2"
		stage: 🏗️ Build
		cache:
		<<: *yarn-cache
		@@ -259,24 +265,34 @@ stages:
		'🧹 PHP Coding standards (PHPCS)':
		<<: [ with-composer-cache, junit-artifacts, *default-job-settings-lint ]
		stage: 🪄 Lint
		variables:
		<<: *default-lint-variables
		KUBERNETES_CPU_REQUEST: "16"
		script:
		- composer phpcs -- --report-junit=junit.xml --report-full --report-summary

		'🧹 PHP Static Analysis (phpstan)':
		<<: [ with-composer-cache, junit-artifacts, *default-job-settings-lint ]
		stage: 🪄 Lint
		variables:
		<<: *default-lint-variables
		KUBERNETES_CPU_REQUEST: "16"
		script:
		- php vendor/bin/phpstan analyze --configuration=./core/phpstan.neon.dist --error-format=gitlab > phpstan-quality-report.json

		'🧹 CSS linting (stylelint)':
		<<: [ with-yarn-cache, junit-artifacts, *default-job-settings-lint ]
		stage: 🪄 Lint
		variables:
		KUBERNETES_CPU_REQUEST: "2"
		script:
		- yarn run --cwd=./core lint:css --color --custom-formatter node_modules/stylelint-junit-formatter > junit.xml

		'🧹 Compilation check':
		<<: [ with-yarn-cache, default-job-settings-lint ]
		stage: 🪄 Lint
		variables:
		KUBERNETES_CPU_REQUEST: "2"
		script:
		- yarn run --cwd=./core build:css --check
		- cd core && yarn run -s check:ckeditor5
		@@ -284,12 +300,16 @@ stages:
		'🧹 JavaScript linting (eslint)':
		<<: [ with-yarn-cache, junit-artifacts, *default-job-settings-lint ]
		stage: 🪄 Lint
		variables:
		KUBERNETES_CPU_REQUEST: "2"
		script:
		- yarn --cwd=./core run -s lint:core-js-passing --format junit > junit.xml

		'📔 Spell-checking':
		<<: [ with-yarn-cache, default-job-settings-lint ]
		stage: 🪄 Lint
		variables:
		KUBERNETES_CPU_REQUEST: "2"
		script:
		- export TARGET_BRANCH=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH}
		- git fetch -vn --depth=$GIT_DEPTH "${CI_MERGE_REQUEST_PROJECT_URL:-origin}" "+refs/heads/$TARGET_BRANCH:refs/heads/$TARGET_BRANCH"

.gitlab-ci/pipeline.yml

+6 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,7 @@ stages:
		<<: *test-variables
		TESTSUITE: PHPUnit-Unit
		CONCURRENCY: "$CONCURRENCY"
		KUBERNETES_CPU_REQUEST: "16"

		'🌐️️ PHPUnit Functional':
		<<: [ with-composer-cache, phpunit-artifacts, setup-webserver, run-tests, *default-job-settings ]
		@@ -207,6 +208,7 @@ stages:
		<<: *test-variables
		TESTSUITE: PHPUnit-Functional
		CONCURRENCY: "$CONCURRENCY"
		KUBERNETES_CPU_REQUEST: "24"
		services:
		- <<: *with-database

		@@ -264,6 +266,7 @@ stages:
		<<: *test-variables
		TESTSUITE: PHPUnit-Kernel
		CONCURRENCY: "$CONCURRENCY"
		KUBERNETES_CPU_REQUEST: "16"
		services:
		- <<: *with-database

		@@ -274,6 +277,7 @@ stages:
		<<: *test-variables
		TESTSUITE: PHPUnit-FunctionalJavascript
		CONCURRENCY: 15
		KUBERNETES_CPU_REQUEST: "8"
		services:
		- <<: *with-database
		- <<: *with-chrome
		@@ -285,6 +289,7 @@ stages:
		<<: *test-variables
		TESTSUITE: PHPUnit-Build
		CONCURRENCY: "$CONCURRENCY"
		KUBERNETES_CPU_REQUEST: "2"
		services:
		- <<: *with-database

		@@ -293,6 +298,7 @@ stages:
		stage: 🗜️ Test
		variables:
		<<: *test-variables
		KUBERNETES_CPU_REQUEST: "3"
		services:
		- <<: *with-database
		- <<: *with-chrome