Testing reusable flow 48

.github/workflows/ci.yml

@@ -5,16 +5,18 @@ on:
 
 jobs:
   e2e-local-lab:
-    uses: ./.github/workflows/run-e2e-local.yml
+    uses: ./.github/workflows/run-e2e.yml
     with:
+      client: local
       environment: lab
       gitref: ${{ github.ref }}
     secrets:
       sops_age_key: ${{ secrets.SOPS_AGE_PRIVATE_KEY }}
 
   e2e-remote-lab:
-    uses: ./.github/workflows/run-e2e-remote.yml
+    uses: ./.github/workflows/run-e2e.yml
     with:
+      client: remote
       environment: lab
       gitref: ${{ github.ref }}
     secrets:

.github/workflows/run-e2e-local.yml → .github/workflows/run-e2e.yml

@@ -4,6 +4,9 @@ on:
       environment:
         required: true
         type: string
+      client:
+        required: true
+        type: string
       gitref:
         required: false
         type: string
@@ -28,9 +31,9 @@ jobs:
 
       - name: Load variables
         id: vars
-        run: cat ./e2e/environments/local.${{ inputs.environment }}.env >> "$GITHUB_OUTPUT"
+        run: cat ./e2e/environments/${{ inputs.client }}.${{ inputs.environment }}.env >> "$GITHUB_OUTPUT"
 
-  e2e-tests-local:
+  e2e-tests:
     runs-on: [ self-hosted ]
     needs: [ e2e-preparations ]
     services:
@@ -57,7 +60,7 @@ jobs:
         run: cd e2e && yarn
 
       - name: Run tests
-        run: cd e2e && yarn test:local:${{ inputs.environment }}
+        run: cd e2e && yarn test:${{ inputs.client }}:${{ inputs.environment }}
         env:
           WEBDRIVER_HOST: host.docker.internal
           WEBDRIVER_PORT: ${{ job.services.webdriver-chrome.ports[4444] }}

environments/remote.prod.env

@@ -0,0 +1,2 @@
+DNS1=1.1.1.1
+DNS2=1.0.0.1

package.json

@@ -9,7 +9,8 @@
   "scripts": {
     "client:local:lab": "env-cmd -f ./environments/local.lab.env docker-compose up --force-recreate --remove-orphans",
     "client:local:prod": "env-cmd -f ./environments/local.prod.env docker-compose up --force-recreate --remove-orphans",
-    "client:remote": "env-cmd -f ./environments/remote.env docker-compose up --force-recreate --remove-orphans",
+    "client:remote:lab": "env-cmd -f ./environments/remote.lab.env docker-compose up --force-recreate --remove-orphans",
+    "client:remote:prod": "env-cmd -f ./environments/remote.prod.env docker-compose up --force-recreate --remove-orphans",
     "test:local:lab": "nightwatch --skiptags remoteonly -e lab",
     "test:local:prod": "nightwatch --skiptags remoteonly -e prod",
     "test:remote:lab": "nightwatch --skiptags localonly -e lab",