Skip to content
Snippets Groups Projects
Commit e6d787eb authored by catch's avatar catch
Browse files

Issue #3398321 by bbrala, catch: Optimize GitLab resource requests phase 1

parent e1c95b2f
No related branches found
No related tags found
No related merge requests found
...@@ -49,6 +49,9 @@ variables: ...@@ -49,6 +49,9 @@ variables:
GIT_DEPTH: "3" GIT_DEPTH: "3"
PARENT_PIPELINE_ID: $CI_PIPELINE_ID PARENT_PIPELINE_ID: $CI_PIPELINE_ID
.default-lint-variables: &default-lint-variables
_TARGET_PHP: "8.2"
_TARGET_DB: "sqlite-3"
############# #############
# Stages # # Stages #
...@@ -73,9 +76,6 @@ stages: ...@@ -73,9 +76,6 @@ stages:
- stuck_or_timeout_failure - stuck_or_timeout_failure
- runner_system_failure - runner_system_failure
- scheduler_failure - scheduler_failure
variables:
_TARGET_PHP: "8.2"
_TARGET_DB: "sqlite-3"
image: image:
name: $_CONFIG_DOCKERHUB_ROOT/php-$_TARGET_PHP-apache:production name: $_CONFIG_DOCKERHUB_ROOT/php-$_TARGET_PHP-apache:production
rules: rules:
...@@ -224,6 +224,9 @@ stages: ...@@ -224,6 +224,9 @@ stages:
'📦️ Composer': '📦️ Composer':
<<: *default-job-settings-lint <<: *default-job-settings-lint
variables:
<<: *default-lint-variables
KUBERNETES_CPU_REQUEST: "1"
stage: 🏗️ Build stage: 🏗️ Build
cache: cache:
key: key:
...@@ -243,6 +246,9 @@ stages: ...@@ -243,6 +246,9 @@ stages:
'📦️ Yarn': '📦️ Yarn':
<<: *default-job-settings-lint <<: *default-job-settings-lint
variables:
<<: *default-lint-variables
KUBERNETES_CPU_REQUEST: "2"
stage: 🏗️ Build stage: 🏗️ Build
cache: cache:
key: key:
...@@ -266,6 +272,9 @@ stages: ...@@ -266,6 +272,9 @@ stages:
'🧹 PHP Static Analysis (phpstan)': '🧹 PHP Static Analysis (phpstan)':
<<: [ *with-composer, *junit-artifacts, *default-job-settings-lint ] <<: [ *with-composer, *junit-artifacts, *default-job-settings-lint ]
stage: 🪄 Lint stage: 🪄 Lint
variables:
<<: *default-lint-variables
KUBERNETES_CPU_REQUEST: "16"
script: script:
- php vendor/bin/phpstan analyze --configuration=./core/phpstan.neon.dist --error-format=gitlab > phpstan-quality-report.json - php vendor/bin/phpstan analyze --configuration=./core/phpstan.neon.dist --error-format=gitlab > phpstan-quality-report.json
artifacts: artifacts:
...@@ -275,6 +284,9 @@ stages: ...@@ -275,6 +284,9 @@ stages:
'🧹 PHP Coding standards (PHPCS)': '🧹 PHP Coding standards (PHPCS)':
<<: [ *with-composer, *junit-artifacts, *default-job-settings-lint ] <<: [ *with-composer, *junit-artifacts, *default-job-settings-lint ]
stage: 🪄 Lint stage: 🪄 Lint
variables:
<<: *default-lint-variables
KUBERNETES_CPU_REQUEST: "16"
script: script:
- composer phpcs -- --report-full --report-summary --report-\\Micheh\\PhpCodeSniffer\\Report\\Gitlab=phpcs-quality-report.json - composer phpcs -- --report-full --report-summary --report-\\Micheh\\PhpCodeSniffer\\Report\\Gitlab=phpcs-quality-report.json
artifacts: artifacts:
...@@ -284,6 +296,8 @@ stages: ...@@ -284,6 +296,8 @@ stages:
'🧹 JavaScript linting (eslint)': '🧹 JavaScript linting (eslint)':
<<: [ *with-yarn, *junit-artifacts, *default-job-settings-lint ] <<: [ *with-yarn, *junit-artifacts, *default-job-settings-lint ]
stage: 🪄 Lint stage: 🪄 Lint
variables:
KUBERNETES_CPU_REQUEST: "2"
script: script:
- yarn --cwd=./core run -s lint:core-js-passing --format gitlab - yarn --cwd=./core run -s lint:core-js-passing --format gitlab
artifacts: artifacts:
...@@ -293,6 +307,8 @@ stages: ...@@ -293,6 +307,8 @@ stages:
'🧹 CSS linting (stylelint)': '🧹 CSS linting (stylelint)':
<<: [ *with-yarn, *junit-artifacts, *default-job-settings-lint ] <<: [ *with-yarn, *junit-artifacts, *default-job-settings-lint ]
stage: 🪄 Lint stage: 🪄 Lint
variables:
KUBERNETES_CPU_REQUEST: "2"
script: script:
- yarn run --cwd=./core lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab - yarn run --cwd=./core lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab
artifacts: artifacts:
...@@ -302,6 +318,8 @@ stages: ...@@ -302,6 +318,8 @@ stages:
'🧹 Compilation check': '🧹 Compilation check':
<<: [ *with-yarn, *default-job-settings-lint ] <<: [ *with-yarn, *default-job-settings-lint ]
stage: 🪄 Lint stage: 🪄 Lint
variables:
KUBERNETES_CPU_REQUEST: "2"
script: script:
- yarn run --cwd=./core build:css --check - yarn run --cwd=./core build:css --check
- cd core && yarn run -s check:ckeditor5 - cd core && yarn run -s check:ckeditor5
...@@ -309,6 +327,8 @@ stages: ...@@ -309,6 +327,8 @@ stages:
'📔 Spell-checking': '📔 Spell-checking':
<<: [ *with-yarn, *default-job-settings-lint ] <<: [ *with-yarn, *default-job-settings-lint ]
stage: 🪄 Lint stage: 🪄 Lint
variables:
KUBERNETES_CPU_REQUEST: "2"
script: script:
- export TARGET_BRANCH=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH} - 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" - git fetch -vn --depth=$GIT_DEPTH "${CI_MERGE_REQUEST_PROJECT_URL:-origin}" "+refs/heads/$TARGET_BRANCH:refs/heads/$TARGET_BRANCH"
......
...@@ -141,6 +141,7 @@ stages: ...@@ -141,6 +141,7 @@ stages:
<<: *test-variables <<: *test-variables
TESTSUITE: PHPUnit-Functional TESTSUITE: PHPUnit-Functional
CONCURRENCY: "$CONCURRENCY" CONCURRENCY: "$CONCURRENCY"
KUBERNETES_CPU_REQUEST: "24"
services: services:
- <<: *with-database - <<: *with-database
...@@ -190,6 +191,7 @@ stages: ...@@ -190,6 +191,7 @@ stages:
<<: *test-variables <<: *test-variables
TESTSUITE: PHPUnit-Kernel TESTSUITE: PHPUnit-Kernel
CONCURRENCY: "$CONCURRENCY" CONCURRENCY: "$CONCURRENCY"
KUBERNETES_CPU_REQUEST: "16"
services: services:
- <<: *with-database - <<: *with-database
...@@ -200,6 +202,7 @@ stages: ...@@ -200,6 +202,7 @@ stages:
<<: *test-variables <<: *test-variables
TESTSUITE: PHPUnit-FunctionalJavascript TESTSUITE: PHPUnit-FunctionalJavascript
CONCURRENCY: 15 CONCURRENCY: 15
KUBERNETES_CPU_REQUEST: "8"
services: services:
- <<: *with-database - <<: *with-database
- <<: *with-chrome - <<: *with-chrome
...@@ -210,6 +213,7 @@ stages: ...@@ -210,6 +213,7 @@ stages:
<<: *test-variables <<: *test-variables
TESTSUITE: PHPUnit-Build TESTSUITE: PHPUnit-Build
CONCURRENCY: "$CONCURRENCY" CONCURRENCY: "$CONCURRENCY"
KUBERNETES_CPU_REQUEST: "2"
services: services:
- <<: *with-database - <<: *with-database
...@@ -223,11 +227,13 @@ stages: ...@@ -223,11 +227,13 @@ stages:
<<: *test-variables <<: *test-variables
TESTSUITE: PHPUnit-Unit TESTSUITE: PHPUnit-Unit
CONCURRENCY: "$CONCURRENCY" CONCURRENCY: "$CONCURRENCY"
KUBERNETES_CPU_REQUEST: "16"
'🦉️️️ Nightwatch': '🦉️️️ Nightwatch':
<<: [ *with-composer-and-yarn, *setup-webserver, *default-job-settings ] <<: [ *with-composer-and-yarn, *setup-webserver, *default-job-settings ]
variables: variables:
<<: *test-variables <<: *test-variables
KUBERNETES_CPU_REQUEST: "3"
services: services:
- <<: *with-database - <<: *with-database
- <<: *with-chrome - <<: *with-chrome
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment