NEXT-35311 - Use k8s runners

Author: mkraeml

.gitlab-ci.yml

@@ -21,6 +21,10 @@ workflow:
         # do not run on push, except on protected branches
         -   if: '$CI_PIPELINE_SOURCE != "push" || ($CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_PROTECTED == "true")'
 
+default:
+  tags:
+    - shopware-multi-arch
+
 include:
     # include library files
     -   local: .gitlab/lib/rules.yml

.gitlab/base.yml

@@ -40,7 +40,7 @@ variables:
     - !reference [.rules, run]
     - when: always
   tags:
-    - shopware
+    - shopware-multi-arch
   before_script:
     - echo -e "\e[0Ksection_start:$(date +%s):base_init[collapsed=true]\r\e[0Kbase initialization"
     - >
@@ -105,7 +105,7 @@ variables:
 .deploy-job:
   extends: .long-running
   tags:
-    -
+    - shopware-multi-arch
   before_script: []
   rules:
     # only sync on protected branches

.gitlab/stages/11-build.yml

@@ -8,7 +8,7 @@ include:
       stage: lint
       context: tar://${CI_PROJECT_DIR}/context.tar.gz
       destination-image: "${CI_REGISTRY_IMAGE}/ci-e2e"
-      destination-tag: "$CI_PIPELINE_ID"
+      destination-tag: "${CI_PIPELINE_ID}"
       additional-tags: "${EXTRA_DEV_BUILD_TAGS}"
       dockerfile: .gitlab/docker/dev/Dockerfile
       enable-scan: "false"

.gitlab/stages/20-unit.yml

@@ -94,16 +94,74 @@ PHP integration:
       --testsuite integration
       --order-by default
 
+PHP bench:
+    extends: .base-no-setup
+    stage: unit
+    tags:
+      - shopware-amd64
+    timeout: 30m
+    allow_failure: true
+    needs: []
+    services:
+        -   name: mariadb:11.0
+            alias: database
+            entrypoint: [ "sh", "-c", "docker-entrypoint.sh $MYSQL_CMD" ]
+        -   name: redis:7.0
+            alias: redis
+    variables:
+        APP_ENV: "dev"
+        REDIS_URL: redis://redis:6379
+        MYSQL_CMD: 'mariadbd'
+    rules:
+        # do not run in merge trains
+        - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
+          when: never
+        - !reference [ .rules, skip ]
+        - !reference [ .rules, run ]
+        - changes:
+            - '**/*.php'
+            - '**/*.xml'
+            - 'composer.json'
+
+    before_script:
+        - !reference [ .scripts, init, composer ]
+        - mkdir -p config/jwt || true
+    script:
+        - php vendor/bin/phpbench run
+            --report=compressed
+
 Open Api Schema validation:
   extends: .base-no-setup
+  image: ${CI_REGISTRY}/infrastructure/docker-base/ci-build:${CI_BUILD_IMAGE_TAG}
   stage: unit
-  timeout: 2m
-  needs: []
-  services:
-    - name: swaggerapi/swagger-validator-v2:v2.0.5
-      alias: swagger
+  timeout: 10m
+  allow_failure: true
+  needs: [build image]
+  tags:
+    - shopware-amd64
   variables:
     APP_ENV: "dev"
+    TEST_WEB_INSTALLER: 1
+    DATABASE_URL: mysql://root:app@database:3306/root
+  services:
+    - name: mysql:8
+      alias: database
+      entrypoint:
+        [
+          "sh",
+          "-c",
+          "docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password --sql-require-primary-key=ON",
+        ]
+    - name: "${CI_REGISTRY_IMAGE}/ci-e2e:$CI_PIPELINE_ID"
+      alias: shopware.test
+      entrypoint:
+        [
+          "sh",
+          "-c",
+          "bin/console system:generate-jwt && /entrypoint"
+        ]
+      variables:
+        PROJECT_ROOT: /var/www/html
   rules:
     # do not run in merge trains
     - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
@@ -116,9 +174,18 @@ Open Api Schema validation:
         - "composer.json"
   before_script:
     - !reference [.scripts, init, composer]
+    - composer run init:db
+    - mkdir -p config/jwt || true
+    - bin/console system:generate-jwt || true
   script:
-    - php ./bin/console open-api:validate http://swagger:8080/validator/debug
-    - php ./bin/console open-api:validate --api-type=store-api http://swagger:8080/validator/debug
+    - export STOREFRONT_ID=$(bin/console sales-channel:list --output json | jq -r '.[] | select(.name == "Storefront") | .id')
+    - export OPENAPI_ACCESS_KEY=$(mysql -u root -h database -papp root -se "SELECT access_key FROM sales_channel WHERE id = 0x${STOREFRONT_ID}";)
+    - printf "OPENAPI_JSON_URL=http://shopware.test:8000\nSHOPWARE_ADMIN_USERNAME=admin\nSHOPWARE_ADMIN_PASSWORD=shopware\nOPENAPI_ACCESS_KEY=${OPENAPI_ACCESS_KEY}" > .env
+    - npx @shopware/api-gen@canary loadSchema --apiType=store --filename=storeApiSchema.json
+    - npx @shopware/api-gen@canary loadSchema --apiType=admin --filename=adminApiSchema.json
+    - npm i -g @redocly/cli@latest
+    - redocly lint --skip-rule operation-4xx-response --skip-rule no-server-example.com ./storeApiSchema.json
+    - redocly lint --skip-rule operation-4xx-response --skip-rule no-server-example.com ./adminApiSchema.json
 
 PHP unit coverage:
   extends: .base-no-setup
@@ -241,7 +308,7 @@ PHP Full:
           - "php8.3"
         FEATURE_ALL: ["false", "major"]
         MYSQL_CMD: "mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password --sql-require-primary-key=ON"
-      - MYSQL_IMAGE: mysql:8.0.17
+      - MYSQL_IMAGE: mysql:8.0.36
       - MYSQL_IMAGE: mariadb:10.11
       - MYSQL_IMAGE: mariadb:10.11
         PREFER_LOWEST: "prefer lowest"

.gitlab/stages/21-security.yml

@@ -8,8 +8,16 @@ Symfony security check:
     before_script: []
     script:
         - composer install --no-interaction --no-scripts
-        - curl --location --output local-php-security-checker https://github.com/fabpot/local-php-security-checker/releases/download/v1.0.0/local-php-security-checker_1.0.0_linux_amd64
-        - echo 'e5b12488ca78bc07c149e9352278bf10667b88a8461caac10154f9a6f5476369  local-php-security-checker' > local-php-security-checker.sha256
+        - >
+            if [[ "$(arch)" == "aarch64" ]]; then
+                export ARCH=arm64
+                export SHA256SUM=d2c0bd8b3f6059e55a55ece56461d04728eeaad73ece902a8e8078d287721eb3
+            else
+                export ARCH=amd64
+                export SHA256SUM=e5b12488ca78bc07c149e9352278bf10667b88a8461caac10154f9a6f5476369
+            fi
+        - curl --location --output local-php-security-checker https://github.com/fabpot/local-php-security-checker/releases/download/v1.0.0/local-php-security-checker_1.0.0_linux_${ARCH}
+        - echo "${SHA256SUM}  local-php-security-checker" > local-php-security-checker.sha256
         - sha256sum --check local-php-security-checker.sha256
         - chmod +x local-php-security-checker
         - ./local-php-security-checker

.gitlab/stages/30-e2e.yml

@@ -5,6 +5,8 @@
   image: shopware/development:8.2-composer-2
   extends:
     - .long-running
+  tags:
+    - shopware-amd64
   needs: [Build, "Jest (Administration)"]
   dependencies: [Build]
   services:
@@ -116,6 +118,8 @@ acceptance:
     - .long-running
   image: mcr.microsoft.com/playwright:v1.41.1-jammy
   needs: [build image]
+  tags:
+    - shopware-amd64
   stage: E2E
   rules:
     - !reference [.rules, skip]

.gitlab/stages/50-install-nightly.yml

@@ -7,7 +7,7 @@ Shopware Install (onPrem):
     - name: mariadb:10.11
       alias: database
   tags:
-    - shopware
+    - shopware-multi-arch
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: always

.gitlab/stages/51-split.yml

@@ -3,11 +3,10 @@
 .split-base:
   stage: split
   tags:
-    - shopware
+    - shopware-multi-arch
   image:
     name: gitlab.shopware.com:5005/infrastructure/docker-base/ci
   variables:
-    SPLITSH_ARCHIVE_URL: 'https://github.com/splitsh/lite/releases/download/v1.0.1/lite_linux_amd64.tar.gz'
     GIT_DEPTH: '0'
     GIT_STRATEGY: 'clone'
   needs: [ ]

.gitlab/stages/60-deploy.yml

@@ -23,7 +23,7 @@ Publish entity-schema-types NPM package:
 .push split repositories:
   stage: deploy
   tags:
-    - shopware
+    - shopware-multi-arch
   image:
     name: gitlab.shopware.com:5005/infrastructure/docker-base/ci
   needs:
@@ -70,16 +70,16 @@ push split repositories (gitlab):
     GITLAB_TOKEN: "${CI_GITLAB_API_TOKEN}"
     CI_COMMENT_MESSAGE: |
       The following testing branches have been created for you:
-      
+
       - [administration:tmp-${CI_COMMIT_SHORT_SHA}](https://gitlab.shopware.com/shopware/6/product/many-repositories/administration/-/tree/tmp-${CI_COMMIT_SHORT_SHA})
       - [storefront:tmp-${CI_COMMIT_SHORT_SHA}](https://gitlab.shopware.com/shopware/6/product/many-repositories/storefront/-/tree/tmp-${CI_COMMIT_SHORT_SHA})
       - [core:tmp-${CI_COMMIT_SHORT_SHA}](https://gitlab.shopware.com/shopware/6/product/many-repositories/core/-/tree/tmp-${CI_COMMIT_SHORT_SHA})
       - [elasticsearch:tmp-${CI_COMMIT_SHORT_SHA}](https://gitlab.shopware.com/shopware/6/product/many-repositories/elasticsearch/-/tree/tmp-${CI_COMMIT_SHORT_SHA})
-      
+
       More info on how to use these branches can be found in the [handbook](https://handbook.shopware.com/Product/Guides/Engineering/Platform/PipelineTestSuite/PrivateComposerRegistry#creating-branches-for-testing).
-      
+
       ---
-      
+
       ```shell
       composer require \
         "shopware/administration:dev-tmp-${CI_COMMIT_SHORT_SHA} as 6.6.x-dev" \

.gitlab/templates/plugin.yml

@@ -146,7 +146,7 @@ workflow:
 default:
     image: $DEV_IMAGE
     tags:
-      - shopware
+      - shopware-amd64
     services:
         - name: "$MYSQL_IMAGE"
           alias: database
@@ -203,6 +203,7 @@ build and validate zip:
     before_script:
       - *setup_platform_and_plugin_files
     script:
+        - source /root/.bashrc # Workaround until Gitlab fixes the Gitlab Kubernetes runner
         - shopware-cli extension zip "${CI_PROJECT_DIR}/custom/plugins/${PLUGIN_NAME}" --git-commit "${CI_COMMIT_SHA}"
         - mv ${PLUGIN_NAME}-${CI_COMMIT_SHA}.zip ${PLUGIN_NAME}.zip
         - shopware-cli extension validate "${PLUGIN_NAME}.zip"
@@ -335,6 +336,8 @@ template filled:
     image: shopware/development:8.2-node-20.10-composer-2
     stage: E2E
     needs: []
+    tags:
+      - shopware-amd64
     script:
         - *e2e-prepare
         - >

.gitlab/templates/theme.yml

@@ -128,7 +128,7 @@ default:
           alias: database
           entrypoint: [ "sh", "-c", "docker-entrypoint.sh $MYSQL8_CMD" ]
     tags:
-      - shopware
+      - shopware-amd64
     before_script:
         - *base_env_vars
         - zip -rq theme.zip .
@@ -244,6 +244,8 @@ template filled:
 cypress:
     image: shopware/development:8.2-node-20.10-composer-2
     stage: E2E
+    tags:
+      - shopware-amd64
     needs:
         - build zip
     rules:

src/Core/Framework/Test/Api/ApiDefinition/Generator/OpenApi3Test.php

@@ -2,12 +2,8 @@
 
 namespace Shopware\Core\Framework\Test\Api\ApiDefinition\Generator;
 
-use GuzzleHttp\Client;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
-use Shopware\Core\DevOps\Environment\EnvironmentHelper;
-use Shopware\Core\Framework\Api\ApiDefinition\DefinitionService;
-use Shopware\Core\Framework\Api\Controller\InfoController;
 use Shopware\Core\Framework\Test\TestCaseBase\KernelLifecycleManager;
 use Shopware\Core\Framework\Test\TestCaseBase\KernelTestBehaviour;
 use Shopware\Core\System\SalesChannel\SalesChannel\StoreApiInfoController;
@@ -16,7 +12,6 @@
 /**
  * @internal
  */
-#[Group('slow')]
 #[Group('skip-paratest')]
 class OpenApi3Test extends TestCase
 {
@@ -49,58 +44,4 @@ public function testRequestOpenApi3Json(): void
 
         static::assertSame(200, $response->getStatusCode(), print_r($response->getContent(), true));
     }
-
-    public function testValidateStoreApiSchema(): void
-    {
-        $infoController = KernelLifecycleManager::getKernel()->getContainer()->get(StoreApiInfoController::class);
-
-        $response = $infoController->info(new Request());
-        $schema = $response->getContent();
-        static::assertIsString($schema);
-
-        $this->assertValidSchema($schema);
-    }
-
-    public function testValidateAdminApiSchema(): void
-    {
-        $infoController = KernelLifecycleManager::getKernel()->getContainer()->get(InfoController::class);
-
-        $response = $infoController->info(new Request());
-        $schema = $response->getContent();
-        static::assertIsString($schema);
-
-        $this->assertValidSchema($schema);
-    }
-
-    public function testValidateAdminApiSchemaJson(): void
-    {
-        $infoController = KernelLifecycleManager::getKernel()->getContainer()->get(InfoController::class);
-
-        $response = $infoController->info(new Request(['type' => DefinitionService::TYPE_JSON]));
-        $schema = $response->getContent();
-        static::assertIsString($schema);
-
-        $this->assertValidSchema($schema);
-    }
-
-    private function assertValidSchema(string $schema): void
-    {
-        $client = new Client();
-        $validatorURL = EnvironmentHelper::getVariable('SWAGGER_VALIDATOR_URL', 'https://validator.swagger.io/validator/debug');
-        static::assertIsString($validatorURL);
-
-        $response = $client->post($validatorURL, [
-            'json' => json_decode($schema, true, 512, \JSON_THROW_ON_ERROR),
-            'headers' => [
-                'Accept' => 'application/json',
-            ],
-        ]);
-        $content = json_decode((string) $response->getBody(), true, flags: \JSON_THROW_ON_ERROR);
-
-        // The CI validator returns an empty response if the schema is valid
-        // The public Web validator returns an object with an empty schemaValidationMessages array
-        $messages = $content['schemaValidationMessages'] ?? [];
-
-        static::assertEmpty($messages, (string) json_encode($content, \JSON_PRETTY_PRINT));
-    }
 }