From 718cdd6072f16f12d0ee2382b5d1f3adab40b78c Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Wed, 26 Feb 2025 15:57:02 +0100 Subject: [PATCH 01/21] [ECP-9608] Parametrise OpenSearch image version and add Magento 2.4.4-p12 to the test matrix --- .github/docker-compose.yml | 2 +- .github/workflows/e2e-test.yml | 6 ++++-- .github/workflows/graphql-test.yml | 1 + .github/workflows/mftf-test.yml | 1 + .github/workflows/restapi-test.yml | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index 7cac6d405..903890d26 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -12,7 +12,7 @@ services: MARIADB_USER: magento MARIADB_PASSWORD: magento opensearch: - image: bitnami/opensearch:2 + image: bitnami/opensearch:${OPENSEARCH_VERSION} container_name: opensearch-container networks: - backend diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index eb62f7dd3..1e68d3a2c 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -32,8 +32,8 @@ jobs: environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }} strategy: matrix: - php-version: ["8.3"] - magento-version: ["2.4.7-p2"] + php-version: ["8.1"] + magento-version: ["2.4.4-p12","2.4.7-p4"] runs-on: group: larger-runners labels: ubuntu-latest-8-cores @@ -41,6 +41,7 @@ jobs: env: PHP_VERSION: ${{ matrix.php-version }} MAGENTO_VERSION: ${{ matrix.magento-version }} + ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} @@ -54,6 +55,7 @@ jobs: - run: echo "TEST_GROUP=${{ env.IS_RELEASE == 'TRUE' && 'all' || (inputs.testGroup || 'standard') }}" >> $GITHUB_ENV - run: echo "TEST_BRANCH=${{ (env.IS_RELEASE == 'TRUE' || !inputs.testBranch) && 'develop' || inputs.testBranch }}" >> $GITHUB_ENV - run: echo "EXPRESS_BRANCH=${{ contains(fromJSON('["all", "express-checkout"]'), env.TEST_GROUP) && (inputs.expressBranch || 'main') || '' }}" >> $GITHUB_ENV + - run: echo "OPENSEARCH_VERSION=${{ matrix.magento-version == '2.4.4-p12' && '1' || '2' }}" >> $GITHUB_ENV - name: Information run: echo "E2E testing against test suite branch ${{env.TEST_BRANCH}} using group ${{env.TEST_GROUP}} ${{ env.EXPRESS_BRANCH && 'with express module branch' || '' }} ${{ env.EXPRESS_BRANCH || '' }}" diff --git a/.github/workflows/graphql-test.yml b/.github/workflows/graphql-test.yml index 7cfb3fcb1..07d8ccd5b 100644 --- a/.github/workflows/graphql-test.yml +++ b/.github/workflows/graphql-test.yml @@ -14,6 +14,7 @@ jobs: env: PHP_VERSION: ${{ matrix.php-version }} MAGENTO_VERSION: ${{ matrix.magento-version }} + OPENSEARCH_VERSION: 2 ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} diff --git a/.github/workflows/mftf-test.yml b/.github/workflows/mftf-test.yml index 8544feb1e..cd61d1bdf 100644 --- a/.github/workflows/mftf-test.yml +++ b/.github/workflows/mftf-test.yml @@ -20,6 +20,7 @@ jobs: env: PHP_VERSION: ${{ matrix.php-version }} MAGENTO_VERSION: ${{ matrix.magento-version }} + OPENSEARCH_VERSION: 2 ADMIN_USERNAME: ${{ secrets.MAGENTO_ADMIN_USERNAME }} ADMIN_PASSWORD: ${{ secrets.MAGENTO_ADMIN_PASSWORD }} DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} diff --git a/.github/workflows/restapi-test.yml b/.github/workflows/restapi-test.yml index 229ae5c92..71b6b0431 100644 --- a/.github/workflows/restapi-test.yml +++ b/.github/workflows/restapi-test.yml @@ -14,6 +14,7 @@ jobs: env: PHP_VERSION: ${{ matrix.php-version }} MAGENTO_VERSION: ${{ matrix.magento-version }} + OPENSEARCH_VERSION: 2 ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} From 2adbc5d71b225d6788754d6a47291e7374e06aa0 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Wed, 26 Feb 2025 16:15:02 +0100 Subject: [PATCH 02/21] [ECP-9608] Update installation command for OpenSearch V1 --- .github/scripts/install_magento.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/scripts/install_magento.sh b/.github/scripts/install_magento.sh index ad81930bc..7fca81f20 100644 --- a/.github/scripts/install_magento.sh +++ b/.github/scripts/install_magento.sh @@ -21,12 +21,21 @@ else fi if [ "$OPENSEARCH_SERVER" != "" ]; then - MAGENTO_INSTALL_ARGS=$(echo \ - --search-engine="opensearch" \ - --opensearch-host="$OPENSEARCH_SERVER" \ - --opensearch-port="$OPENSEARCH_PORT" \ - --opensearch-index-prefix="$OPENSEARCH_INDEX_PREFIX" \ - --opensearch-timeout="$OPENSEARCH_TIMEOUT") + if [ "$OPENSEARCH_VERSION" -eq 2]; then + MAGENTO_INSTALL_ARGS=$(echo \ + --search-engine="opensearch" \ + --opensearch-host="$OPENSEARCH_SERVER" \ + --opensearch-port="$OPENSEARCH_PORT" \ + --opensearch-index-prefix="$OPENSEARCH_INDEX_PREFIX" \ + --opensearch-timeout="$OPENSEARCH_TIMEOUT") + else + MAGENTO_INSTALL_ARGS=$(echo \ + --search-engine="opensearch" \ + --elasticsearch-host="$OPENSEARCH_SERVER" \ + --elasticsearch-port="$OPENSEARCH_PORT" \ + --elasticsearch-index-prefix="$OPENSEARCH_INDEX_PREFIX" \ + --elasticsearch-timeout="$OPENSEARCH_TIMEOUT") + fi RET=1 while [ $RET -ne 0 ]; do echo "Checking if $OPENSEARCH_SERVER is available." From 04d4a8dd624b21762690c156616a6c4f3966dd14 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Wed, 26 Feb 2025 16:21:27 +0100 Subject: [PATCH 03/21] [ECP-9608] Update arguments --- .github/scripts/install_magento.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/scripts/install_magento.sh b/.github/scripts/install_magento.sh index 7fca81f20..b3e9c649d 100644 --- a/.github/scripts/install_magento.sh +++ b/.github/scripts/install_magento.sh @@ -30,7 +30,6 @@ if [ "$OPENSEARCH_SERVER" != "" ]; then --opensearch-timeout="$OPENSEARCH_TIMEOUT") else MAGENTO_INSTALL_ARGS=$(echo \ - --search-engine="opensearch" \ --elasticsearch-host="$OPENSEARCH_SERVER" \ --elasticsearch-port="$OPENSEARCH_PORT" \ --elasticsearch-index-prefix="$OPENSEARCH_INDEX_PREFIX" \ From 568f35e69c7d56f278668bd3404fc01c4884ada2 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Wed, 26 Feb 2025 16:32:09 +0100 Subject: [PATCH 04/21] [ECP-9608] Update arguments --- .github/scripts/install_magento.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/scripts/install_magento.sh b/.github/scripts/install_magento.sh index b3e9c649d..8ad24938b 100644 --- a/.github/scripts/install_magento.sh +++ b/.github/scripts/install_magento.sh @@ -21,19 +21,19 @@ else fi if [ "$OPENSEARCH_SERVER" != "" ]; then - if [ "$OPENSEARCH_VERSION" -eq 2]; then - MAGENTO_INSTALL_ARGS=$(echo \ + if [ "$OPENSEARCH_VERSION" -eq 2 ]; then + MAGENTO_INSTALL_ARGS=\ --search-engine="opensearch" \ --opensearch-host="$OPENSEARCH_SERVER" \ --opensearch-port="$OPENSEARCH_PORT" \ --opensearch-index-prefix="$OPENSEARCH_INDEX_PREFIX" \ - --opensearch-timeout="$OPENSEARCH_TIMEOUT") + --opensearch-timeout="$OPENSEARCH_TIMEOUT" else - MAGENTO_INSTALL_ARGS=$(echo \ + MAGENTO_INSTALL_ARGS=\ --elasticsearch-host="$OPENSEARCH_SERVER" \ --elasticsearch-port="$OPENSEARCH_PORT" \ --elasticsearch-index-prefix="$OPENSEARCH_INDEX_PREFIX" \ - --elasticsearch-timeout="$OPENSEARCH_TIMEOUT") + --elasticsearch-timeout="$OPENSEARCH_TIMEOUT" fi RET=1 while [ $RET -ne 0 ]; do From 8bf71e18d8a6b35d1ee66a3ea9d41f13e7152b53 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Wed, 26 Feb 2025 16:42:51 +0100 Subject: [PATCH 05/21] [ECP-9608] Update arguments --- .github/scripts/install_magento.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/install_magento.sh b/.github/scripts/install_magento.sh index 8ad24938b..375360e31 100644 --- a/.github/scripts/install_magento.sh +++ b/.github/scripts/install_magento.sh @@ -22,18 +22,18 @@ fi if [ "$OPENSEARCH_SERVER" != "" ]; then if [ "$OPENSEARCH_VERSION" -eq 2 ]; then - MAGENTO_INSTALL_ARGS=\ + MAGENTO_INSTALL_ARGS=$(echo \ --search-engine="opensearch" \ --opensearch-host="$OPENSEARCH_SERVER" \ --opensearch-port="$OPENSEARCH_PORT" \ --opensearch-index-prefix="$OPENSEARCH_INDEX_PREFIX" \ - --opensearch-timeout="$OPENSEARCH_TIMEOUT" + --opensearch-timeout="$OPENSEARCH_TIMEOUT") else - MAGENTO_INSTALL_ARGS=\ + MAGENTO_INSTALL_ARGS=$(echo \ --elasticsearch-host="$OPENSEARCH_SERVER" \ --elasticsearch-port="$OPENSEARCH_PORT" \ --elasticsearch-index-prefix="$OPENSEARCH_INDEX_PREFIX" \ - --elasticsearch-timeout="$OPENSEARCH_TIMEOUT" + --elasticsearch-timeout="$OPENSEARCH_TIMEOUT") fi RET=1 while [ $RET -ne 0 ]; do From d1b815be97e20639952dc65d8cdb854c81165f81 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Wed, 26 Feb 2025 16:54:55 +0100 Subject: [PATCH 06/21] [ECP-9608] Update arguments --- .github/Dockerfile | 1 + .github/workflows/e2e-test.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index 4b181e872..d332e0777 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -13,6 +13,7 @@ OPENSEARCH_SERVER="" \ OPENSEARCH_PORT=9200 \ OPENSEARCH_INDEX_PREFIX=magento2 \ OPENSEARCH_TIMEOUT=15 \ +OPENSEARCH_VERSION="" \ ADMIN_NAME=admin \ ADMIN_LASTNAME=admin \ ADMIN_EMAIL=admin@example.com \ diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 1e68d3a2c..d49e6dadf 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -41,7 +41,6 @@ jobs: env: PHP_VERSION: ${{ matrix.php-version }} MAGENTO_VERSION: ${{ matrix.magento-version }} - ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} From a87231c9f352b34c8d4a92200c5c0206e093e4dd Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 08:42:48 +0100 Subject: [PATCH 07/21] [ECP-9608] Update environment variables --- .github/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index 903890d26..f6ddfb2ec 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -38,6 +38,7 @@ services: environment: DB_SERVER: mariadb OPENSEARCH_SERVER: opensearch-container + OPENSEARCH_VERSION: ${OPENSEARCH_VERSION} MAGENTO_HOST: magento2.test.com VIRTUAL_HOST: magento2.test.com COMPOSER_MEMORY_LIMIT: -1 From 2d297feba71787003334a142dd6452810edd692b Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 11:30:55 +0100 Subject: [PATCH 08/21] [ECP-9608] Parametrize N98-magerun installation --- .github/Makefile | 16 ++++++++-------- .github/docker-compose.yml | 5 ++--- .github/workflows/e2e-test.yml | 5 +++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/Makefile b/.github/Makefile index 8038ee0e6..476a5b71c 100644 --- a/.github/Makefile +++ b/.github/Makefile @@ -1,11 +1,11 @@ # Install N98-Magerun -n98-magerun2.phar: - wget -q https://files.magerun.net/n98-magerun2.phar - chmod +x ./n98-magerun2.phar +build-n98-magerun2: + wget -q https://files.magerun.net/n98-magerun2-${N98_MAGERUN_VERSION}.phar + chmod +x ./n98-magerun2-${N98_MAGERUN_VERSION}.phar # Check Magento installation -sys-check: n98-magerun2.phar - ./n98-magerun2.phar sys:check +sys-check: build-n98-magerun2 + ./n98-magerun2-${N98_MAGERUN_VERSION}.phar sys:check # Install Magento (without starting Apache) magento: @@ -26,7 +26,7 @@ dev-module: bin/magento setup:upgrade # Configuration -configure: n98-magerun2.phar +configure: build-n98-magerun2 bin/magento config:set payment/adyen_abstract/demo_mode 1 bin/magento adyen:enablepaymentmethods:run bin/magento config:set payment/adyen_abstract/has_holder_name 1 @@ -49,8 +49,8 @@ configure: n98-magerun2.phar bin/magento config:set payment/adyen_abstract/client_key_test "${ADYEN_CLIENT_KEY}" bin/magento config:set payment/adyen_abstract/notification_username 'admin' bin/magento config:set payment/adyen_abstract/payment_methods_active 1 - ./n98-magerun2.phar config:store:set --encrypt payment/adyen_abstract/notification_password '1234' > /dev/null - ./n98-magerun2.phar config:store:set --encrypt payment/adyen_abstract/api_key_test "${ADYEN_API_KEY}" > /dev/null + ./n98-magerun2-${N98_MAGERUN_VERSION}.phar config:store:set --encrypt payment/adyen_abstract/notification_password '1234' > /dev/null + ./n98-magerun2-${N98_MAGERUN_VERSION}.phar config:store:set --encrypt payment/adyen_abstract/api_key_test "${ADYEN_API_KEY}" > /dev/null # Clear cache flush: diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index f6ddfb2ec..3033481a7 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: db: image: mariadb:10.4 @@ -38,7 +36,8 @@ services: environment: DB_SERVER: mariadb OPENSEARCH_SERVER: opensearch-container - OPENSEARCH_VERSION: ${OPENSEARCH_VERSION} + OPENSEARCH_VERSION: + N98_MAGERUN_VERSION: MAGENTO_HOST: magento2.test.com VIRTUAL_HOST: magento2.test.com COMPOSER_MEMORY_LIMIT: -1 diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index d49e6dadf..5550ede70 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -27,7 +27,7 @@ on: default: "main" jobs: - build: + e2e_test_job: if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) || (github.event_name == 'workflow_dispatch') environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }} strategy: @@ -54,7 +54,8 @@ jobs: - run: echo "TEST_GROUP=${{ env.IS_RELEASE == 'TRUE' && 'all' || (inputs.testGroup || 'standard') }}" >> $GITHUB_ENV - run: echo "TEST_BRANCH=${{ (env.IS_RELEASE == 'TRUE' || !inputs.testBranch) && 'develop' || inputs.testBranch }}" >> $GITHUB_ENV - run: echo "EXPRESS_BRANCH=${{ contains(fromJSON('["all", "express-checkout"]'), env.TEST_GROUP) && (inputs.expressBranch || 'main') || '' }}" >> $GITHUB_ENV - - run: echo "OPENSEARCH_VERSION=${{ matrix.magento-version == '2.4.4-p12' && '1' || '2' }}" >> $GITHUB_ENV + - run: echo "OPENSEARCH_VERSION=${{ contains(fromJSON('["2.4.4"]'), matrix.magento-version) && '1' || '2' }}" >> $GITHUB_ENV + - run: echo "N98_MAGERUN_VERSION=${{ contains(fromJSON('["2.4.4"]'), matrix.magento-version) && '7.5.0' || 'latest' }}" >> $GITHUB_ENV - name: Information run: echo "E2E testing against test suite branch ${{env.TEST_BRANCH}} using group ${{env.TEST_GROUP}} ${{ env.EXPRESS_BRANCH && 'with express module branch' || '' }} ${{ env.EXPRESS_BRANCH || '' }}" From 25736676b8125bb6d00723f04d3f5941c4b19c84 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 11:36:33 +0100 Subject: [PATCH 09/21] [ECP-9608] Update environment variables --- .github/workflows/e2e-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 5550ede70..35a9baf31 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -54,8 +54,8 @@ jobs: - run: echo "TEST_GROUP=${{ env.IS_RELEASE == 'TRUE' && 'all' || (inputs.testGroup || 'standard') }}" >> $GITHUB_ENV - run: echo "TEST_BRANCH=${{ (env.IS_RELEASE == 'TRUE' || !inputs.testBranch) && 'develop' || inputs.testBranch }}" >> $GITHUB_ENV - run: echo "EXPRESS_BRANCH=${{ contains(fromJSON('["all", "express-checkout"]'), env.TEST_GROUP) && (inputs.expressBranch || 'main') || '' }}" >> $GITHUB_ENV - - run: echo "OPENSEARCH_VERSION=${{ contains(fromJSON('["2.4.4"]'), matrix.magento-version) && '1' || '2' }}" >> $GITHUB_ENV - - run: echo "N98_MAGERUN_VERSION=${{ contains(fromJSON('["2.4.4"]'), matrix.magento-version) && '7.5.0' || 'latest' }}" >> $GITHUB_ENV + - run: echo "OPENSEARCH_VERSION=${{ contains(matrix.magento-version, "2.4.4") && '1' || '2' }}" >> $GITHUB_ENV + - run: echo "N98_MAGERUN_VERSION=${{ contains(matrix.magento-version, "2.4.4") && "7.5.0" || "latest" }}" >> $GITHUB_ENV - name: Information run: echo "E2E testing against test suite branch ${{env.TEST_BRANCH}} using group ${{env.TEST_GROUP}} ${{ env.EXPRESS_BRANCH && 'with express module branch' || '' }} ${{ env.EXPRESS_BRANCH || '' }}" From 11776c8b7b8f836d2ef1647dabdfda0bacdc1023 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 11:38:22 +0100 Subject: [PATCH 10/21] [ECP-9608] Update environment variables --- .github/workflows/e2e-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 35a9baf31..0f4807688 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -54,7 +54,7 @@ jobs: - run: echo "TEST_GROUP=${{ env.IS_RELEASE == 'TRUE' && 'all' || (inputs.testGroup || 'standard') }}" >> $GITHUB_ENV - run: echo "TEST_BRANCH=${{ (env.IS_RELEASE == 'TRUE' || !inputs.testBranch) && 'develop' || inputs.testBranch }}" >> $GITHUB_ENV - run: echo "EXPRESS_BRANCH=${{ contains(fromJSON('["all", "express-checkout"]'), env.TEST_GROUP) && (inputs.expressBranch || 'main') || '' }}" >> $GITHUB_ENV - - run: echo "OPENSEARCH_VERSION=${{ contains(matrix.magento-version, "2.4.4") && '1' || '2' }}" >> $GITHUB_ENV + - run: echo "OPENSEARCH_VERSION=${{ contains(matrix.magento-version, "2.4.4") && "1" || "2" }}" >> $GITHUB_ENV - run: echo "N98_MAGERUN_VERSION=${{ contains(matrix.magento-version, "2.4.4") && "7.5.0" || "latest" }}" >> $GITHUB_ENV - name: Information From 37e023d5ba3104f7c8e7405112f0ee45102ce164 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 11:41:53 +0100 Subject: [PATCH 11/21] [ECP-9608] Update environment variables --- .github/workflows/e2e-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 0f4807688..b5992b3fb 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -54,8 +54,8 @@ jobs: - run: echo "TEST_GROUP=${{ env.IS_RELEASE == 'TRUE' && 'all' || (inputs.testGroup || 'standard') }}" >> $GITHUB_ENV - run: echo "TEST_BRANCH=${{ (env.IS_RELEASE == 'TRUE' || !inputs.testBranch) && 'develop' || inputs.testBranch }}" >> $GITHUB_ENV - run: echo "EXPRESS_BRANCH=${{ contains(fromJSON('["all", "express-checkout"]'), env.TEST_GROUP) && (inputs.expressBranch || 'main') || '' }}" >> $GITHUB_ENV - - run: echo "OPENSEARCH_VERSION=${{ contains(matrix.magento-version, "2.4.4") && "1" || "2" }}" >> $GITHUB_ENV - - run: echo "N98_MAGERUN_VERSION=${{ contains(matrix.magento-version, "2.4.4") && "7.5.0" || "latest" }}" >> $GITHUB_ENV + - run: echo "OPENSEARCH_VERSION=${{ contains(matrix.magento-version, '2.4.4') && '1' || '2' }}" >> $GITHUB_ENV + - run: echo "N98_MAGERUN_VERSION=${{ contains(matrix.magento-version, '2.4.4') && '7.5.0' || 'latest' }}" >> $GITHUB_ENV - name: Information run: echo "E2E testing against test suite branch ${{env.TEST_BRANCH}} using group ${{env.TEST_GROUP}} ${{ env.EXPRESS_BRANCH && 'with express module branch' || '' }} ${{ env.EXPRESS_BRANCH || '' }}" From f4e717118ac9eb3f7df84b20c64b24254c8b0e97 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 11:57:55 +0100 Subject: [PATCH 12/21] [ECP-9608] Remove redundant magerun installation --- .github/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/Makefile b/.github/Makefile index 476a5b71c..007f585b2 100644 --- a/.github/Makefile +++ b/.github/Makefile @@ -26,7 +26,7 @@ dev-module: bin/magento setup:upgrade # Configuration -configure: build-n98-magerun2 +configure: bin/magento config:set payment/adyen_abstract/demo_mode 1 bin/magento adyen:enablepaymentmethods:run bin/magento config:set payment/adyen_abstract/has_holder_name 1 From adcc3427de1cfef9ff985011ec3716efbfb1d026 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 12:10:03 +0100 Subject: [PATCH 13/21] [ECP-9608] Enable archiving application logs --- .github/docker-compose.yml | 1 + .github/workflows/e2e-test.yml | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index 3033481a7..81d2593e7 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -58,6 +58,7 @@ services: - ./Makefile:/var/www/html/Makefile - composer:/usr/local/bin - magento:/var/www/html + - ../app-logs:/var/www/html/var/logs networks: backend: volumes: diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index b5992b3fb..12444b93f 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -144,3 +144,10 @@ jobs: with: name: html-report path: test-report + + - name: Archive application logs + if: always() + uses: actions/upload-artifact@v4 + with: + name: app-logs + path: app-logs From 26544ea2cc2fb7770176d981cfefd7e976fb99f8 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 14:25:12 +0100 Subject: [PATCH 14/21] [ECP-9608] Enable archiving application logs --- .github/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index 81d2593e7..29618ea89 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -58,7 +58,7 @@ services: - ./Makefile:/var/www/html/Makefile - composer:/usr/local/bin - magento:/var/www/html - - ../app-logs:/var/www/html/var/logs + - app-logs:/var/www/html/var/logs networks: backend: volumes: From ca355c7bc2d318a975abb6c1c0a5828097ae83a3 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 14:26:59 +0100 Subject: [PATCH 15/21] [ECP-9608] Enable archiving application logs --- .github/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index 29618ea89..f0a0daeb0 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -58,7 +58,7 @@ services: - ./Makefile:/var/www/html/Makefile - composer:/usr/local/bin - magento:/var/www/html - - app-logs:/var/www/html/var/logs + - ./app-logs:/var/www/html/var/logs networks: backend: volumes: From 09a605d665433ab738edc6939a68801c1b3452ea Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 14:29:04 +0100 Subject: [PATCH 16/21] [ECP-9608] Enable archiving application logs --- .github/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index f0a0daeb0..b57f74390 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -58,7 +58,7 @@ services: - ./Makefile:/var/www/html/Makefile - composer:/usr/local/bin - magento:/var/www/html - - ./app-logs:/var/www/html/var/logs + - ../app-logs:/var/www/html/var/log networks: backend: volumes: From 61744a4e1be5cc51ea0eff515da7dacb61140572 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 14:45:34 +0100 Subject: [PATCH 17/21] [ECP-9608] Remove type declaration --- Model/Sales/OrderRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Sales/OrderRepository.php b/Model/Sales/OrderRepository.php index 091929407..be9a11dab 100644 --- a/Model/Sales/OrderRepository.php +++ b/Model/Sales/OrderRepository.php @@ -64,7 +64,7 @@ public function __construct( $this->filterGroupBuilder = $filterGroupBuilder; } - public function getOrderByQuoteId(int $quoteId): OrderInterface|false + public function getOrderByQuoteId(int $quoteId) { $quoteIdFilter = $this->filterBuilder->setField('quote_id') ->setConditionType('eq') From b7dfcd4471fde7cd7dd85b472b3f460cc6e09f1b Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 15:00:56 +0100 Subject: [PATCH 18/21] [ECP-9608] Remove type declaration --- Block/Adminhtml/System/Config/Field/Tokenization.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Block/Adminhtml/System/Config/Field/Tokenization.php b/Block/Adminhtml/System/Config/Field/Tokenization.php index 909cc9402..b13bde1ae 100644 --- a/Block/Adminhtml/System/Config/Field/Tokenization.php +++ b/Block/Adminhtml/System/Config/Field/Tokenization.php @@ -60,7 +60,7 @@ protected function _prepareToRender(): void ); } - private function getEnabledRenderer(): SelectYesNo|BlockInterface + private function getEnabledRenderer(): BlockInterface { if (!$this->enabledRenderer) { $this->enabledRenderer = $this->getLayout()->createBlock( From 073f94078af5b9189235efe44480cb23c19347cb Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 16:01:35 +0100 Subject: [PATCH 19/21] [ECP-9608] Rename workflow jobs --- .github/workflows/codeql.yml | 2 +- .github/workflows/e2e-test.yml | 3 ++- .github/workflows/graphql-test.yml | 3 ++- .github/workflows/main.yml | 3 ++- .github/workflows/mftf-test.yml | 3 ++- .github/workflows/restapi-test.yml | 3 ++- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 12baaccd5..7bfaab419 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: jobs: - analyze: + codeql_analyze_job: name: Analyze runs-on: ubuntu-latest timeout-minutes: 25 diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 12444b93f..92cbaa49c 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -27,7 +27,8 @@ on: default: "main" jobs: - e2e_test_job: + run_e2e_test_job: + name: Run E2E tests if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) || (github.event_name == 'workflow_dispatch') environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }} strategy: diff --git a/.github/workflows/graphql-test.yml b/.github/workflows/graphql-test.yml index 07d8ccd5b..e5714aed3 100644 --- a/.github/workflows/graphql-test.yml +++ b/.github/workflows/graphql-test.yml @@ -2,7 +2,8 @@ name: GraphQL Tests on: [pull_request, pull_request_target] jobs: - build: + run_graphql_test_job: + name: Run GraphQL API functional tests if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }} strategy: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a098ffa89..bb151a107 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,8 @@ on: workflow_dispatch: jobs: - build: + run_main_test_job: + name: Run unit tests and code sniffer if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) || (github.event_name == 'workflow_dispatch') environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }} runs-on: ubuntu-latest diff --git a/.github/workflows/mftf-test.yml b/.github/workflows/mftf-test.yml index cd61d1bdf..1b844902b 100644 --- a/.github/workflows/mftf-test.yml +++ b/.github/workflows/mftf-test.yml @@ -7,7 +7,8 @@ on: branches: [main] jobs: - build: + mftf_job: + name: Run Magento Functional Test Framework if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }} strategy: diff --git a/.github/workflows/restapi-test.yml b/.github/workflows/restapi-test.yml index 71b6b0431..bb40e3128 100644 --- a/.github/workflows/restapi-test.yml +++ b/.github/workflows/restapi-test.yml @@ -2,7 +2,8 @@ name: REST API Tests on: [pull_request, pull_request_target] jobs: - build: + rest_test_job: + name: Run REST API functional tests if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }} strategy: From db791b7c677e0e1a6399d88752bbd1d027c33595 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 16:03:17 +0100 Subject: [PATCH 20/21] [ECP-9608] Update environment variables --- .github/workflows/graphql-test.yml | 1 + .github/workflows/restapi-test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/graphql-test.yml b/.github/workflows/graphql-test.yml index e5714aed3..223be29e3 100644 --- a/.github/workflows/graphql-test.yml +++ b/.github/workflows/graphql-test.yml @@ -16,6 +16,7 @@ jobs: PHP_VERSION: ${{ matrix.php-version }} MAGENTO_VERSION: ${{ matrix.magento-version }} OPENSEARCH_VERSION: 2 + N98_MAGERUN_VERSION: latest ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} diff --git a/.github/workflows/restapi-test.yml b/.github/workflows/restapi-test.yml index bb40e3128..3c97b4d2f 100644 --- a/.github/workflows/restapi-test.yml +++ b/.github/workflows/restapi-test.yml @@ -16,6 +16,7 @@ jobs: PHP_VERSION: ${{ matrix.php-version }} MAGENTO_VERSION: ${{ matrix.magento-version }} OPENSEARCH_VERSION: 2 + N98_MAGERUN_VERSION: latest ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} From 0d441c4da9b55275d8027c4dcb62f291871402a1 Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 27 Feb 2025 16:03:50 +0100 Subject: [PATCH 21/21] [ECP-9608] Revert debug logging --- .github/docker-compose.yml | 1 - .github/workflows/e2e-test.yml | 7 ------- 2 files changed, 8 deletions(-) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index b57f74390..3033481a7 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -58,7 +58,6 @@ services: - ./Makefile:/var/www/html/Makefile - composer:/usr/local/bin - magento:/var/www/html - - ../app-logs:/var/www/html/var/log networks: backend: volumes: diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 92cbaa49c..1c1f7398c 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -145,10 +145,3 @@ jobs: with: name: html-report path: test-report - - - name: Archive application logs - if: always() - uses: actions/upload-artifact@v4 - with: - name: app-logs - path: app-logs