From 64ff9688e2542ac8d684e13b9b7cbbb7141eaddd Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 7 Mar 2024 14:56:48 +0100 Subject: [PATCH 1/3] Remove DEPLOY_SAMPLEDATA env variable from MFTF tests --- .github/docker-compose.yml | 11 ----------- .github/workflows/e2e-test-dispatch.yml | 10 ++++------ .github/workflows/e2e-test-express-checkout.yml | 10 ++++------ .github/workflows/e2e-test.yml | 10 ++++------ .github/workflows/graphql-test.yml | 1 + .github/workflows/mftf-test.yml | 2 +- .github/workflows/restapi-test.yml | 1 + 7 files changed, 15 insertions(+), 30 deletions(-) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index a98825c9e..6970e7253 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -41,17 +41,6 @@ services: MAGENTO_HOST: magento2.test.com VIRTUAL_HOST: magento2.test.com COMPOSER_MEMORY_LIMIT: -1 - DEPLOY_SAMPLEDATA: 1 - DONATION_ACCOUNT: - ADMIN_USERNAME: - ADMIN_PASSWORD: - ADYEN_MERCHANT: - ADYEN_API_KEY: - ADYEN_CLIENT_KEY: - PHP_VERSION: - MAGENTO_VERSION: - WEBHOOK_PASSWORD: - WEBHOOK_USERNAME: depends_on: - db - elastic diff --git a/.github/workflows/e2e-test-dispatch.yml b/.github/workflows/e2e-test-dispatch.yml index 8586405e5..277f71eb1 100644 --- a/.github/workflows/e2e-test-dispatch.yml +++ b/.github/workflows/e2e-test-dispatch.yml @@ -31,6 +31,9 @@ jobs: env: PHP_VERSION: "8.1" MAGENTO_VERSION: "2.4.5" + ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} + ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} steps: @@ -43,9 +46,7 @@ jobs: run: docker-compose -f .github/docker-compose.yml up -d web env: DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} - ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} - ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} - ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + DEPLOY_SAMPLEDATA: 1 - name: Setup permissions run: docker exec magento2-container make fs @@ -102,9 +103,6 @@ jobs: MAGENTO_BASE_URL: ${{secrets.MAGENTO_BASE_URL}} PAYPAL_USERNAME: ${{secrets.PLAYWRIGHT_PAYPAL_USERNAME}} PAYPAL_PASSWORD: ${{secrets.PLAYWRIGHT_PAYPAL_PASSWORD}} - ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} - ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} - ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} GOOGLE_USERNAME: ${{secrets.GOOGLE_USERNAME}} GOOGLE_PASSWORD: ${{secrets.GOOGLE_PASSWORD}} WEBHOOK_USERNAME: admin diff --git a/.github/workflows/e2e-test-express-checkout.yml b/.github/workflows/e2e-test-express-checkout.yml index 2442526a3..b8d228db0 100644 --- a/.github/workflows/e2e-test-express-checkout.yml +++ b/.github/workflows/e2e-test-express-checkout.yml @@ -21,6 +21,9 @@ jobs: env: PHP_VERSION: "8.1" MAGENTO_VERSION: "2.4.5" + ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} + ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} steps: @@ -33,9 +36,7 @@ jobs: run: docker-compose -f .github/docker-compose.yml up -d web env: DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} - ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} - ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} - ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + DEPLOY_SAMPLEDATA: 1 - name: Setup permissions run: docker exec magento2-container make fs @@ -67,9 +68,6 @@ jobs: MAGENTO_BASE_URL: ${{secrets.MAGENTO_BASE_URL}} PAYPAL_USERNAME: ${{secrets.PLAYWRIGHT_PAYPAL_USERNAME}} PAYPAL_PASSWORD: ${{secrets.PLAYWRIGHT_PAYPAL_PASSWORD}} - ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} - ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} - ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} GOOGLE_USERNAME: ${{secrets.GOOGLE_USERNAME}} GOOGLE_PASSWORD: ${{secrets.GOOGLE_PASSWORD}} WEBHOOK_USERNAME: admin diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index efdfe971c..13475f345 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -18,6 +18,9 @@ jobs: env: PHP_VERSION: "8.1" MAGENTO_VERSION: "2.4.5" + ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} + ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} steps: @@ -30,9 +33,7 @@ jobs: run: docker-compose -f .github/docker-compose.yml up -d web env: DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} - ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} - ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} - ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + DEPLOY_SAMPLEDATA: 1 - name: Setup permissions run: docker exec magento2-container make fs @@ -80,9 +81,6 @@ jobs: MAGENTO_BASE_URL: ${{secrets.MAGENTO_BASE_URL}} PAYPAL_USERNAME: ${{secrets.PLAYWRIGHT_PAYPAL_USERNAME}} PAYPAL_PASSWORD: ${{secrets.PLAYWRIGHT_PAYPAL_PASSWORD}} - ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} - ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} - ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} WEBHOOK_USERNAME: admin WEBHOOK_PASSWORD: 1234 diff --git a/.github/workflows/graphql-test.yml b/.github/workflows/graphql-test.yml index 5e48cf430..020375f79 100644 --- a/.github/workflows/graphql-test.yml +++ b/.github/workflows/graphql-test.yml @@ -29,6 +29,7 @@ jobs: ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + DEPLOY_SAMPLEDATA: 1 - name: Setup permissions run: docker exec magento2-container make fs diff --git a/.github/workflows/mftf-test.yml b/.github/workflows/mftf-test.yml index 74b27cb0b..7b4e144c5 100644 --- a/.github/workflows/mftf-test.yml +++ b/.github/workflows/mftf-test.yml @@ -2,7 +2,7 @@ name: Functional Tests on: workflow_dispatch: pull_request: - branches: [main] + branches: [main, develop] jobs: build: diff --git a/.github/workflows/restapi-test.yml b/.github/workflows/restapi-test.yml index 7e72f6752..3a8804ce5 100644 --- a/.github/workflows/restapi-test.yml +++ b/.github/workflows/restapi-test.yml @@ -29,6 +29,7 @@ jobs: ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + DEPLOY_SAMPLEDATA: 1 - name: Setup permissions run: docker exec magento2-container make fs From 1dc653902b0c55f3baac508fe694c968dbfc4c3d Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 7 Mar 2024 15:09:25 +0100 Subject: [PATCH 2/3] Update variables --- .github/docker-compose.yml | 9 +++++++++ .github/workflows/mftf-test.yml | 1 + 2 files changed, 10 insertions(+) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index 6970e7253..18db909ed 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -41,6 +41,15 @@ services: MAGENTO_HOST: magento2.test.com VIRTUAL_HOST: magento2.test.com COMPOSER_MEMORY_LIMIT: -1 + DEPLOY_SAMPLEDATA: + DONATION_ACCOUNT: + ADMIN_USERNAME: + ADMIN_PASSWORD: + ADYEN_MERCHANT: + ADYEN_API_KEY: + ADYEN_CLIENT_KEY: + PHP_VERSION: + MAGENTO_VERSION: depends_on: - db - elastic diff --git a/.github/workflows/mftf-test.yml b/.github/workflows/mftf-test.yml index 7b4e144c5..0677bf051 100644 --- a/.github/workflows/mftf-test.yml +++ b/.github/workflows/mftf-test.yml @@ -27,6 +27,7 @@ jobs: ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + ADMIN_URLEXT: admin # Temp solution to wait for install script to run - name: Sleep for 120 seconds From b937c84b5c63750789f719a5a97ab3582f75b2ac Mon Sep 17 00:00:00 2001 From: Can Demiralp Date: Thu, 7 Mar 2024 15:44:50 +0100 Subject: [PATCH 3/3] Update variables --- .github/workflows/e2e-test-dispatch.yml | 7 +++---- .github/workflows/e2e-test-express-checkout.yml | 5 ++--- .github/workflows/e2e-test.yml | 5 ++--- .github/workflows/graphql-test.yml | 11 +++++------ .github/workflows/mftf-test.yml | 11 +++++------ .github/workflows/restapi-test.yml | 11 +++++------ 6 files changed, 22 insertions(+), 28 deletions(-) diff --git a/.github/workflows/e2e-test-dispatch.yml b/.github/workflows/e2e-test-dispatch.yml index 277f71eb1..52a9e97fa 100644 --- a/.github/workflows/e2e-test-dispatch.yml +++ b/.github/workflows/e2e-test-dispatch.yml @@ -36,6 +36,8 @@ jobs: ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} + DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} + DEPLOY_SAMPLEDATA: 1 steps: - uses: actions/checkout@v3 @@ -44,10 +46,7 @@ jobs: - name: Start web server in background run: docker-compose -f .github/docker-compose.yml up -d web - env: - DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} - DEPLOY_SAMPLEDATA: 1 - + - name: Setup permissions run: docker exec magento2-container make fs diff --git a/.github/workflows/e2e-test-express-checkout.yml b/.github/workflows/e2e-test-express-checkout.yml index b8d228db0..91e505b3f 100644 --- a/.github/workflows/e2e-test-express-checkout.yml +++ b/.github/workflows/e2e-test-express-checkout.yml @@ -26,6 +26,8 @@ jobs: ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} + DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} + DEPLOY_SAMPLEDATA: 1 steps: - uses: actions/checkout@v3 @@ -34,9 +36,6 @@ jobs: - name: Start web server in background run: docker-compose -f .github/docker-compose.yml up -d web - env: - DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} - DEPLOY_SAMPLEDATA: 1 - name: Setup permissions run: docker exec magento2-container make fs diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 13475f345..35550df3b 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -23,6 +23,8 @@ jobs: ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} + DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} + DEPLOY_SAMPLEDATA: 1 steps: - uses: actions/checkout@v3 @@ -31,9 +33,6 @@ jobs: - name: Start web server in background run: docker-compose -f .github/docker-compose.yml up -d web - env: - DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} - DEPLOY_SAMPLEDATA: 1 - name: Setup permissions run: docker exec magento2-container make fs diff --git a/.github/workflows/graphql-test.yml b/.github/workflows/graphql-test.yml index 020375f79..2193cea74 100644 --- a/.github/workflows/graphql-test.yml +++ b/.github/workflows/graphql-test.yml @@ -15,6 +15,11 @@ jobs: MAGENTO_VERSION: ${{ matrix.magento-version }} ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} + DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} + ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} + ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} + ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + DEPLOY_SAMPLEDATA: 1 steps: - uses: actions/checkout@v3 @@ -24,12 +29,6 @@ jobs: - name: Start web server in background run: docker-compose -f .github/docker-compose.yml up -d web - env: - DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} - ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} - ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} - ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} - DEPLOY_SAMPLEDATA: 1 - name: Setup permissions run: docker exec magento2-container make fs diff --git a/.github/workflows/mftf-test.yml b/.github/workflows/mftf-test.yml index 0677bf051..a413c452b 100644 --- a/.github/workflows/mftf-test.yml +++ b/.github/workflows/mftf-test.yml @@ -17,17 +17,16 @@ jobs: MAGENTO_VERSION: ${{ matrix.magento-version }} ADMIN_USERNAME: ${{ secrets.MAGENTO_ADMIN_USERNAME }} ADMIN_PASSWORD: ${{ secrets.MAGENTO_ADMIN_PASSWORD }} + DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} + ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} + ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} + ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + ADMIN_URLEXT: admin steps: - uses: actions/checkout@v3 - name: Start services run: docker-compose -f .github/docker-compose.yml -f .github/docker-compose.mftf.yml up -d - env: - DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} - ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} - ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} - ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} - ADMIN_URLEXT: admin # Temp solution to wait for install script to run - name: Sleep for 120 seconds diff --git a/.github/workflows/restapi-test.yml b/.github/workflows/restapi-test.yml index 3a8804ce5..ee855613c 100644 --- a/.github/workflows/restapi-test.yml +++ b/.github/workflows/restapi-test.yml @@ -15,6 +15,11 @@ jobs: MAGENTO_VERSION: ${{ matrix.magento-version }} ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}} + DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} + ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} + ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} + ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} + DEPLOY_SAMPLEDATA: 1 steps: - uses: actions/checkout@v3 @@ -24,12 +29,6 @@ jobs: - name: Start web server in background run: docker-compose -f .github/docker-compose.yml up -d web - env: - DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} - ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} - ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}} - ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}} - DEPLOY_SAMPLEDATA: 1 - name: Setup permissions run: docker exec magento2-container make fs