Update variables

Adyen · Mar 7, 2024 · b937c84 · b937c84
1 parent afd0114
commit b937c84
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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