Revert "pipeline improvements, fixes #5331"revert-c178c26a

This reverts merge request !3993

1 files changed, 43 insertions, 88 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c0211b..0ae7375 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,18 +34,18 @@ stages:
   - release
 
 .scripts:
-  mkdir-caches:
+  mkdir-caches: &mkdir-caches
     - mkdir -p $CACHE_DIR
-  mkdir-reports:
+  mkdir-reports: &mkdir-reports
     - mkdir -p $REPORT_DIR
-  install-composer:
+  install-composer: &install-composer
     - make composer-dev
-  configure-studip:
-    - !reference [.scripts, install-composer]
+  configure-studip: &configure-studip
+    - *install-composer
     - cp docker/studip/config_local.php config/config_local.inc.php
     - cp config/config.inc.php.dist config/config.inc.php
-  initialize-studip-database:
-    - !reference [.scripts, configure-studip]
+  initialize-studip-database: &initialize-studip-database
+    - *configure-studip
     - chmod +x .gitlab/scripts/install_db.sh
     - .gitlab/scripts/install_db.sh
     - cli/studip migrate
@@ -58,7 +58,7 @@ stages:
     paths:
       - composer/
     policy: pull
-  npm:
+  npm: &npm-cache
     key:
       files:
         - package-lock.json
@@ -66,35 +66,13 @@ stages:
       - .npm
 
 .definitions:
-  mariadb-service:
+  mariadb-service: &mariadb-service
    - name: mariadb
      command: [ "--sql_mode=","--character-set-client=utf8","--character-set-server=utf8","--collation-server=utf8_unicode_ci"]
-  php-changed:
-    - changes:
-        paths:
-          - "**/*.php"
-          - composer.lock
-        compare_to: 'refs/heads/main'
-  css-changed:
-    - changes:
-        paths:
-          - "resources/assets/stylesheets/**/*"
-          - package-lock.json
-        compare_to: 'refs/heads/main'
-  js-changed:
-    - changes:
-        paths:
-          - "resources/assets/javascripts/**/*"
-          - "resources/vue/**/*"
-          - package-lock.json
-        compare_to: 'refs/heads/main'
 
 build-composer:
   stage: build
   needs: []
-  rules:
-    - !reference [.definitions, php-changed]
-    -  when: manual
   interruptible: true
   variables:
     COMPOSER_CACHE: $CACHE_DIR/composer-cache
@@ -103,7 +81,7 @@ build-composer:
   script:
     - composer install
   cache:
-    - !reference [.caches, composer]
+    - *composer-cache
     - key: composer-package-cache
       paths:
         - $COMPOSER_CACHE
@@ -112,22 +90,20 @@ build-composer:
 lint-php:
   stage: checks
   needs: [build-composer]
-  rules:
-    - !reference [.definitions, php-changed]
   variables:
     CACHE_LOCATION: $CACHE_DIR/phplint-cache
     PHPLINT_JSON_REPORT: $REPORT_DIR/phplint-report.json
     PHPLINT_CODE_QUALITY_REPORT: $REPORT_DIR/phplint-codequality.json
   interruptible: true
   cache:
-    - !reference [.caches, composer]
+    - *composer-cache
     - key: "$CI_JOB_NAME_SLUG:$CI_COMMIT_REF_SLUG"
       paths:
         - $CACHE_LOCATION
   before_script:
-    - !reference [.scripts, mkdir-caches]
-    - !reference [.scripts, mkdir-reports]
-    - !reference [.scripts, install-composer]
+    - *mkdir-caches
+    - *mkdir-reports
+    - *install-composer
   script:
     - COMPOSER_MEMORY_LIMIT=-1
       composer exec phplint
@@ -144,22 +120,20 @@ lint-php-8.3:
   image: studip/studip:tests-php8.3
   stage: checks
   needs: [build-composer]
-  rules:
-    - !reference [.definitions, php-changed]
   variables:
     CACHE_LOCATION: $CACHE_DIR/phplint-cache
     PHPLINT_JSON_REPORT: $REPORT_DIR/phplint-report-8.3.json
     PHPLINT_CODE_QUALITY_REPORT: $REPORT_DIR/phplint-codequality-8.3.json
   interruptible: true
   cache:
-    - !reference [.caches, composer]
+    - *composer-cache
     - key: "$CI_JOB_NAME_SLUG:$CI_COMMIT_REF_SLUG"
       paths:
         - $CACHE_LOCATION
   before_script:
-    - !reference [.scripts, mkdir-caches]
-    - !reference [.scripts, mkdir-reports]
-    - !reference [.scripts, install-composer]
+    - *mkdir-caches
+    - *mkdir-reports
+    - *install-composer
   script:
     - COMPOSER_MEMORY_LIMIT=-1
       composer exec phplint
@@ -175,8 +149,6 @@ lint-php-8.3:
 lint-js:
   stage: checks
   needs: []
-  rules:
-    - !reference [.definitions, js-changed]
   image: $NODE_IMAGE
   variables:
     CACHE_LOCATION: $CACHE_DIR/eslint-cache
@@ -187,9 +159,8 @@ lint-js:
         - $CACHE_LOCATION
   interruptible: true
   before_script:
-    - !reference [.scripts, mkdir-reports]
-    - !reference [.scripts, mkdir-caches]
-    - npm ci --prefer-offline
+    - *mkdir-reports
+    - npm ci --prefer--offline
   script:
     - npm run lint-js --
       --cache --cache-location $CACHE_LOCATION
@@ -201,8 +172,6 @@ lint-js:
 lint-css:
   stage: checks
   needs: []
-  rules:
-    - !reference [.definitions, css-changed]
   image: $NODE_IMAGE
   variables:
     CACHE_LOCATION: $CACHE_DIR/stylelint-cache
@@ -215,9 +184,9 @@ lint-css:
       policy: pull-push
       when: always
   before_script:
-    - !reference [.scripts, mkdir-reports]
-    - !reference [.scripts, mkdir-caches]
-    - npm ci --prefer-offline
+    - *mkdir-caches
+    - *mkdir-reports
+    - npm install
   script:
     - npm run lint-css --
       --cache --cache-location $CACHE_LOCATION
@@ -235,15 +204,15 @@ phpstan:
     PHPSTAN_CODE_QUALITY_REPORT: $REPORT_DIR/phpstan-codequality.json
   interruptible: true
   cache:
-   - !reference [.caches, composer]
+   - *composer-cache
    - key: "$CO_JOB_NAME_SLUG:$CI_COMMIT_REF_SLUG"
      paths:
        - $CACHE_LOCATION
   before_script:
-    - !reference [.scripts, mkdir-caches]
-    - !reference [.scripts, mkdir-reports]
-    - !reference [.scripts, install-composer]
-    - 'echo "includes:\n    - phpstan.neon.dist\n\nparameters:\n   tmpDir: $PHPSTAN_CACHE_PATH" > phpstan.neon'
+    - *mkdir-caches
+    - *mkdir-reports
+    - *install-composer
+    - 'echo -e "includes:\n    - phpstan.neon.dist\n\nparameters:\n   tmpDir: $PHPSTAN_CACHE_PATH" > phpstan.neon'
   script:
     - php
       composer/bin/phpstan analyse
@@ -260,8 +229,6 @@ phpstan:
 test-unit:
   stage: test
   needs: [lint-php]
-  rules:
-    - !reference [.definitions, php-changed]
   variables:
     PHPUNIT_XML_REPORT: $REPORT_DIR/phpunit-report.xml
   cache:
@@ -270,8 +237,8 @@ test-unit:
   allow_failure: false
   interruptible: true
   before_script:
-    - !reference [.scripts, mkdir-reports]
-    - !reference [.scripts, configure-studip]
+    - *mkdir-reports
+    - *configure-studip
   script:
     - 'composer/bin/codecept
       run unit
@@ -286,16 +253,13 @@ test-unit:
 test-jest:
   stage: test
   needs: [lint-js]
-  rules:
-    - !reference [.definitions, js-changed]
   image: $NODE_IMAGE
   variables:
     JS_TEST_REPORT: $REPORT_DIR/jest.xml
-  cache:
-    - !reference [.caches, npm]
+  cache: *npm-cache
   interruptible: true
   before_script:
-    - !reference [.scripts, mkdir-reports]
+    - *mkdir-reports
     - npm install
   script:
     - JEST_JUNIT_OUTPUT_FILE="$JS_TEST_REPORT" npx jest tests/jest/ --ci --reporters=default --reporters=jest-junit
@@ -306,8 +270,6 @@ test-jest:
 test-functional:
   stage: test
   needs: [lint-php]
-  rules:
-    - !reference [.definitions, php-changed]
   variables:
     FUNCTIONAL_XML_REPORT: $REPORT_DIR/functional-report.xml
     FUNCTIONAL_CODE_QUALITY_REPORT: $REPORT_DIR/functional-codequality.json
@@ -315,12 +277,12 @@ test-functional:
     <<: *composer-cache
     policy: pull
   services:
-    - !reference [.definitions, mariadb-service]
+    - *mariadb-service
   allow_failure: false
   interruptible: true
   before_script:
-    - !reference [.scripts, mkdir-reports]
-    - !reference [.scripts, initialize-studip-database]
+    - *mkdir-reports
+    - *initialize-studip-database
   script:
     - 'composer/bin/codecept
       run functional
@@ -335,19 +297,17 @@ test-functional:
 test-jsonapi:
   stage: test
   needs: [lint-php]
-  rules:
-    - !reference [.definitions, php-changed]
   cache:
     <<: *composer-cache
     policy: pull
   services:
-    - !reference [.definitions, mariadb-service]
+    - *mariadb-service
   variables:
     JSONAPI_XML_REPORT: $REPORT_DIR/jsonapi-report.xml
   interruptible: true
   before_script:
-    - !reference [.scripts, mkdir-reports]
-    - !reference [.scripts, initialize-studip-database]
+    - *mkdir-reports
+    - *initialize-studip-database
   script:
     - 'composer/bin/codecept
       run jsonapi
@@ -362,13 +322,8 @@ test-jsonapi:
 test-assets:
   stage: test
   needs: []
-  rules:
-    - !reference [.definitions, js-changed]
-    - !reference [.definitions, css-changed]
-    -  when: manual
   image: $NODE_IMAGE
-  cache:
-    - !reference [.caches, npm]
+  cache: *npm-cache
   interruptible: true
   before_script:
     - npm install
@@ -388,8 +343,8 @@ test-e2e:
   interruptible: true
   when: manual
   cache:
-    - !reference [.caches, composer]
-    - !reference [.caches, npm]
+    - *composer-cache
+    - *npm-cache
   before_script:
     - mkdir ./bin
     - apt-get update
@@ -408,8 +363,8 @@ test-e2e:
     - php composer-setup.php  --install-dir=./bin --filename=composer
     - export PATH="./bin:$PATH"
     - php -r "unlink('composer-setup.php');"
-    - !reference [.scripts, mkdir-reports]
-    - !reference [.scripts, initialize-studip-database]
+    - *mkdir-reports
+    - *initialize-studip-database
     - ./cli/studip config:set SHOW_TERMS_ON_FIRST_LOGIN 0
     - npm install playwright
     - npm ci