From ff8bb3090163fc60f07e0a893ec38b890de5abeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?=
 <joakim.melseth@gmail.com>
Date: Mon, 3 Oct 2022 16:21:34 +0200
Subject: [PATCH 1/8] ci(e2e-tests): add e2e-tests workflow for CD apps

---
 ci/e2e-tests-exceptions.yml |  11 ++++
 ci/e2e-tests-result.yml     |  24 ++++++++
 ci/e2e-tests-skip.yml       |  12 ++++
 ci/e2e-tests.yml            | 120 ++++++++++++++++++++++++++++++++++++
 4 files changed, 167 insertions(+)
 create mode 100644 ci/e2e-tests-exceptions.yml
 create mode 100644 ci/e2e-tests-result.yml
 create mode 100644 ci/e2e-tests-skip.yml
 create mode 100644 ci/e2e-tests.yml

diff --git a/ci/e2e-tests-exceptions.yml b/ci/e2e-tests-exceptions.yml
new file mode 100644
index 0000000..d915fcd
--- /dev/null
+++ b/ci/e2e-tests-exceptions.yml
@@ -0,0 +1,11 @@
+name: 'dhis2: e2e tests exceptions'
+
+on:
+    push:
+
+jobs:
+    call-e2e-tests-result:
+        if: github.actor == 'dhis2-bot' || contains(github.event.head_commit.message, '[skip ci]')
+        uses: ./.github/workflows/e2e-tests-result.yml
+        with:
+            result: true
diff --git a/ci/e2e-tests-result.yml b/ci/e2e-tests-result.yml
new file mode 100644
index 0000000..153bdcd
--- /dev/null
+++ b/ci/e2e-tests-result.yml
@@ -0,0 +1,24 @@
+name: 'dhis2: result of e2e tests'
+
+# The job here (e2e-tests-success) will be set to true if all the tests pass.
+# Setting "call-e2e-tests-result / e2e-tests-success"  as a required step in your workflow is recommended.
+
+on:
+    workflow_call:
+        inputs:
+            result:
+                required: true
+                type: boolean
+
+defaults:
+    run:
+        shell: bash
+
+jobs:
+    e2e-tests-success:
+        runs-on: ubuntu-latest
+        steps:
+            - name: verify
+              run: if [ $result != true ]; then exit 1; fi;
+              env:
+                  result: ${{ inputs.result }}
diff --git a/ci/e2e-tests-skip.yml b/ci/e2e-tests-skip.yml
new file mode 100644
index 0000000..ebd7d26
--- /dev/null
+++ b/ci/e2e-tests-skip.yml
@@ -0,0 +1,12 @@
+name: 'dhis2: skip e2e tests'
+
+on:
+    pull_request_target:
+        types: [labeled]
+
+jobs:
+    call-e2e-tests-result:
+        if: github.event.label.name == 'skip-e2e-tests'
+        uses: ./.github/workflows/e2e-tests-result.yml
+        with:
+            result: true
diff --git a/ci/e2e-tests.yml b/ci/e2e-tests.yml
new file mode 100644
index 0000000..f527cf1
--- /dev/null
+++ b/ci/e2e-tests.yml
@@ -0,0 +1,120 @@
+name: 'dhis2: e2e tests'
+
+# Requirements:
+#
+# - Secrets:
+#     GITHUB_TOKEN
+#     CYPRESS_DHIS2_USERNAME
+#     CYPRESS_DHIS2_PASSWORD
+#
+# - Customize environment variables:
+#     URL_PREFIX_INSTANCES: Set the URL prefix for your instances.
+#                           All instances are required to have this prefix followed by "[majorVersion].[minorVersion]" for released versions (e.g. 2.39) and "dev" for a dev instance.
+#                           Example: https://test.e2e.dhis2.org/test-
+#     CYPRESS_CONTAINERS:  Set the number of parallel Cypress job runs running for each backend version.
+#     TRIGGER_LABELS:  Set the labels that will trigger the workflow.
+#
+# - Set status check as required:
+#     We recommend setting "call-e2e-tests-result / e2e-tests-success"  as a required step in your workflow.
+#     This will ensure that one of the following must be true before the PR can be merged:
+#       1) The tests have successfully run
+#       2) The dev took a conscious decision not to run the tests (see e2e-tests-skip.yml)
+#       3) They were skipped due to a special case (see e2e-tests-exception.yml)
+
+on:
+    pull_request:
+        types: [labeled]
+
+env:
+    URL_PREFIX_INSTANCES: [YOUR URL PREFIX]
+    CYPRESS_CONTAINERS: 6
+    TRIGGER_LABELS: e2e-tests, testing
+
+defaults:
+    run:
+        shell: bash
+
+jobs:
+    prerequisites:
+        runs-on: ubuntu-latest
+        outputs:
+            json-labels: ${{ steps.json-labels.outputs.labels }}
+            matrix-containers: ${{ steps.matrix-containers.outputs.containers }}
+            versions: ${{ steps.legacy-versions.outputs.versions }}
+        steps:
+            - name: compute-json-labels
+              id: json-labels
+              run: |
+                  arrLabels=(${TRIGGER_LABELS//,/ })
+                  for item in ${arrLabels[@]}; do labels+=\"$item\",; done
+                  echo "::set-output name=labels::[ ${labels%,} ]"
+
+            - name: compute-matrix-containers
+              id: matrix-containers
+              if: contains(fromJson(steps.json-labels.outputs.labels), github.event.label.name)
+              run: |
+                  for (( cnt = 1; cnt <= $CYPRESS_CONTAINERS; cnt++)); do containers+=$cnt,; done
+                  echo "::set-output name=containers::[ ${containers%,} ]"
+
+            - if: contains(fromJson(steps.json-labels.outputs.labels), github.event.label.name)
+              uses: actions/checkout@v2
+
+            - id: legacy-versions
+              if: contains(fromJson(steps.json-labels.outputs.labels), github.event.label.name)
+              uses: dhis2/action-supported-legacy-versions@v1
+              with:
+                  instance-url-latest: ${{ env.URL_PREFIX_INSTANCES }}dev # can be removed if maxDHIS2Version has been specified
+                  username: ${{ secrets.CYPRESS_DHIS2_USERNAME }} # can be removed if maxDHIS2Version has been specified
+                  password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} # can be removed if maxDHIS2Version has been specified
+
+    cypress:
+        needs: prerequisites
+        if: contains(fromJson(needs.prerequisites.outputs.json-labels), github.event.label.name)
+        runs-on: ubuntu-latest
+        container: cypress/browsers:node14.7.0-chrome84
+        strategy:
+            fail-fast: false
+            matrix:
+                versions: ${{ fromJSON(needs.prerequisites.outputs.versions) }}
+                containers: ${{ fromJSON(needs.prerequisites.outputs.matrix-containers) }}
+        steps:
+            - uses: actions/checkout@v2
+
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 14.x
+
+            - uses: actions/cache@v2
+              id: yarn-cache
+              with:
+                  path: '**/node_modules'
+                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+
+            - name: Install
+              if: steps.yarn-cache.outputs.cache-hit != 'true'
+              run: yarn install --frozen-lockfile
+
+            - name: Cypress run
+              uses: cypress-io/github-action@v2
+              with:
+                  record: true
+                  parallel: true
+                  group: e2e-chrome-parallel-${{ matrix.versions }}
+                  browser: chrome
+                  start: yarn d2-app-scripts start
+                  wait-on: http://localhost:3000
+                  wait-on-timeout: 300
+              env:
+                  CI: true
+                  CYPRESS_RECORD_KEY: '6b0bce0d-a4e8-417b-bbee-9157cbe9a999'
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CYPRESS_dhis2BaseUrl: ${{ env.URL_PREFIX_INSTANCES }}${{ matrix.versions }}
+                  CYPRESS_dhis2InstanceVersion: ${{ matrix.versions }}
+                  CYPRESS_dhis2Username: ${{ secrets.CYPRESS_DHIS2_USERNAME }}
+                  CYPRESS_dhis2Password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }}
+
+    call-e2e-tests-result:
+        needs: cypress
+        uses: ./.github/workflows/e2e-tests-result.yml
+        with:
+            result: true

From 7063a48fb78c71dde4a7e91e503a2734364c698a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?=
 <joakim.melseth@gmail.com>
Date: Tue, 11 Oct 2022 12:27:08 +0200
Subject: [PATCH 2/8] chore: use pattern for instance names

---
 ci/e2e-tests.yml | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/ci/e2e-tests.yml b/ci/e2e-tests.yml
index f527cf1..cf5d57e 100644
--- a/ci/e2e-tests.yml
+++ b/ci/e2e-tests.yml
@@ -8,11 +8,11 @@ name: 'dhis2: e2e tests'
 #     CYPRESS_DHIS2_PASSWORD
 #
 # - Customize environment variables:
-#     URL_PREFIX_INSTANCES: Set the URL prefix for your instances.
-#                           All instances are required to have this prefix followed by "[majorVersion].[minorVersion]" for released versions (e.g. 2.39) and "dev" for a dev instance.
-#                           Example: https://test.e2e.dhis2.org/test-
-#     CYPRESS_CONTAINERS:  Set the number of parallel Cypress job runs running for each backend version.
-#     TRIGGER_LABELS:  Set the labels that will trigger the workflow.
+#     BASE_URL_INSTANCES: Set the base url for the instances, e.g. https://test.e2e.dhis2.org
+#     NAME_PATTERN_LEGACY_INSTANCES: Set the name pattern for your instances. {version} will be replaced by "[majorVersion].[minorVersion]"
+#     NAME_PATTERN_DEV_INSTANCE: Set the name pattern for your dev instance. {version} will be replaced by "dev"
+#     CYPRESS_CONTAINERS: Set the number of parallel Cypress job runs running for each backend version.
+#     TRIGGER_LABELS: Set the labels that will trigger the workflow.
 #
 # - Set status check as required:
 #     We recommend setting "call-e2e-tests-result / e2e-tests-success"  as a required step in your workflow.
@@ -26,8 +26,10 @@ on:
         types: [labeled]
 
 env:
-    URL_PREFIX_INSTANCES: [YOUR URL PREFIX]
-    CYPRESS_CONTAINERS: 6
+    BASE_URL_INSTANCES: https://test.e2e.dhis2.org
+    NAME_PATTERN_LEGACY_INSTANCES: {version}dev
+    NAME_PATTERN_DEV_INSTANCE: dev
+    CYPRESS_CONTAINERS: 8
     TRIGGER_LABELS: e2e-tests, testing
 
 defaults:
@@ -59,11 +61,16 @@ jobs:
             - if: contains(fromJson(steps.json-labels.outputs.labels), github.event.label.name)
               uses: actions/checkout@v2
 
+            - name: compute-instance-url
+              id: instance-url
+              if: contains(fromJson(steps.json-labels.outputs.labels), github.event.label.name)
+              run: echo "::set-output name=url::${BASE_URL_INSTANCES%/}/${NAME_PATTERN_DEV_INSTANCE/"{version}"/dev}"
+
             - id: legacy-versions
               if: contains(fromJson(steps.json-labels.outputs.labels), github.event.label.name)
               uses: dhis2/action-supported-legacy-versions@v1
               with:
-                  instance-url-latest: ${{ env.URL_PREFIX_INSTANCES }}dev # can be removed if maxDHIS2Version has been specified
+                  instance-url-latest: ${{ steps.instance-url.outputs.url }} # can be removed if maxDHIS2Version has been specified
                   username: ${{ secrets.CYPRESS_DHIS2_USERNAME }} # can be removed if maxDHIS2Version has been specified
                   password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} # can be removed if maxDHIS2Version has been specified
 
@@ -94,6 +101,12 @@ jobs:
               if: steps.yarn-cache.outputs.cache-hit != 'true'
               run: yarn install --frozen-lockfile
 
+            - name: compute-instance-url
+              id: instance-url
+              run: echo "::set-output name=url::${BASE_URL_INSTANCES%/}/${NAME_PATTERN_LEGACY_INSTANCES/"{version}"/$version}"
+              env:
+                  version: ${{ matrix.versions }}
+
             - name: Cypress run
               uses: cypress-io/github-action@v2
               with:
@@ -108,8 +121,8 @@ jobs:
                   CI: true
                   CYPRESS_RECORD_KEY: '6b0bce0d-a4e8-417b-bbee-9157cbe9a999'
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  CYPRESS_dhis2BaseUrl: ${{ env.URL_PREFIX_INSTANCES }}${{ matrix.versions }}
-                  CYPRESS_dhis2InstanceVersion: ${{ matrix.versions }}
+                  CYPRESS_dhis2BaseUrl: ${{ steps.instance-url.outputs.url }}
+                  CYPRESS_dhis2InstanceVersion: ${{matrix.versions}}
                   CYPRESS_dhis2Username: ${{ secrets.CYPRESS_DHIS2_USERNAME }}
                   CYPRESS_dhis2Password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }}
 

From 6b853244594206645dadf8a7de386a54f181c19c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?=
 <joakim.melseth@gmail.com>
Date: Mon, 17 Oct 2022 13:16:13 +0200
Subject: [PATCH 3/8] chore: use pr ready instead of labels to trigger

---
 ci/e2e-tests-exceptions.yml | 11 -----
 ci/e2e-tests-result.yml     | 24 ----------
 ci/e2e-tests-skip.yml       | 12 -----
 ci/e2e-tests.yml            | 91 ++++++++++++++-----------------------
 4 files changed, 35 insertions(+), 103 deletions(-)
 delete mode 100644 ci/e2e-tests-exceptions.yml
 delete mode 100644 ci/e2e-tests-result.yml
 delete mode 100644 ci/e2e-tests-skip.yml

diff --git a/ci/e2e-tests-exceptions.yml b/ci/e2e-tests-exceptions.yml
deleted file mode 100644
index d915fcd..0000000
--- a/ci/e2e-tests-exceptions.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: 'dhis2: e2e tests exceptions'
-
-on:
-    push:
-
-jobs:
-    call-e2e-tests-result:
-        if: github.actor == 'dhis2-bot' || contains(github.event.head_commit.message, '[skip ci]')
-        uses: ./.github/workflows/e2e-tests-result.yml
-        with:
-            result: true
diff --git a/ci/e2e-tests-result.yml b/ci/e2e-tests-result.yml
deleted file mode 100644
index 153bdcd..0000000
--- a/ci/e2e-tests-result.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: 'dhis2: result of e2e tests'
-
-# The job here (e2e-tests-success) will be set to true if all the tests pass.
-# Setting "call-e2e-tests-result / e2e-tests-success"  as a required step in your workflow is recommended.
-
-on:
-    workflow_call:
-        inputs:
-            result:
-                required: true
-                type: boolean
-
-defaults:
-    run:
-        shell: bash
-
-jobs:
-    e2e-tests-success:
-        runs-on: ubuntu-latest
-        steps:
-            - name: verify
-              run: if [ $result != true ]; then exit 1; fi;
-              env:
-                  result: ${{ inputs.result }}
diff --git a/ci/e2e-tests-skip.yml b/ci/e2e-tests-skip.yml
deleted file mode 100644
index ebd7d26..0000000
--- a/ci/e2e-tests-skip.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 'dhis2: skip e2e tests'
-
-on:
-    pull_request_target:
-        types: [labeled]
-
-jobs:
-    call-e2e-tests-result:
-        if: github.event.label.name == 'skip-e2e-tests'
-        uses: ./.github/workflows/e2e-tests-result.yml
-        with:
-            result: true
diff --git a/ci/e2e-tests.yml b/ci/e2e-tests.yml
index cf5d57e..05bc906 100644
--- a/ci/e2e-tests.yml
+++ b/ci/e2e-tests.yml
@@ -11,63 +11,47 @@ name: 'dhis2: e2e tests'
 #     BASE_URL_INSTANCES: Set the base url for the instances, e.g. https://test.e2e.dhis2.org
 #     NAME_PATTERN_LEGACY_INSTANCES: Set the name pattern for your instances. {version} will be replaced by "[majorVersion].[minorVersion]"
 #     NAME_PATTERN_DEV_INSTANCE: Set the name pattern for your dev instance. {version} will be replaced by "dev"
-#     CYPRESS_CONTAINERS: Set the number of parallel Cypress job runs running for each backend version.
-#     TRIGGER_LABELS: Set the labels that will trigger the workflow.
+#
+# - Other optional customizations:
+#     containers: Set the matrix containers array for the cypress job. The number of parallel Cypress instances running for each backend version will equal the array length.
 #
 # - Set status check as required:
-#     We recommend setting "call-e2e-tests-result / e2e-tests-success"  as a required step in your workflow.
-#     This will ensure that one of the following must be true before the PR can be merged:
-#       1) The tests have successfully run
-#       2) The dev took a conscious decision not to run the tests (see e2e-tests-skip.yml)
-#       3) They were skipped due to a special case (see e2e-tests-exception.yml)
+#     We recommend setting "e2e-tests-success"  as a required step in your workflow.
 
 on:
     pull_request:
-        types: [labeled]
+        types: [opened, synchronize, reopened, ready_for_review]
 
 env:
     BASE_URL_INSTANCES: https://test.e2e.dhis2.org
-    NAME_PATTERN_LEGACY_INSTANCES: {version}dev
+    NAME_PATTERN_LEGACY_INSTANCES: '{version}dev'
     NAME_PATTERN_DEV_INSTANCE: dev
-    CYPRESS_CONTAINERS: 8
-    TRIGGER_LABELS: e2e-tests, testing
+
+concurrency:
+    group: ${{ github.workflow}}-${{ github.ref }}
+    cancel-in-progress: true
 
 defaults:
     run:
         shell: bash
 
 jobs:
-    prerequisites:
+    compute-versions:
+        if: github.event.pull_request.draft == false
         runs-on: ubuntu-latest
         outputs:
-            json-labels: ${{ steps.json-labels.outputs.labels }}
-            matrix-containers: ${{ steps.matrix-containers.outputs.containers }}
             versions: ${{ steps.legacy-versions.outputs.versions }}
         steps:
-            - name: compute-json-labels
-              id: json-labels
-              run: |
-                  arrLabels=(${TRIGGER_LABELS//,/ })
-                  for item in ${arrLabels[@]}; do labels+=\"$item\",; done
-                  echo "::set-output name=labels::[ ${labels%,} ]"
-
-            - name: compute-matrix-containers
-              id: matrix-containers
-              if: contains(fromJson(steps.json-labels.outputs.labels), github.event.label.name)
-              run: |
-                  for (( cnt = 1; cnt <= $CYPRESS_CONTAINERS; cnt++)); do containers+=$cnt,; done
-                  echo "::set-output name=containers::[ ${containers%,} ]"
-
-            - if: contains(fromJson(steps.json-labels.outputs.labels), github.event.label.name)
-              uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - name: compute-instance-url
               id: instance-url
-              if: contains(fromJson(steps.json-labels.outputs.labels), github.event.label.name)
-              run: echo "::set-output name=url::${BASE_URL_INSTANCES%/}/${NAME_PATTERN_DEV_INSTANCE/"{version}"/dev}"
+              run: |
+                  url=${BASE_URL_INSTANCES%/}/${NAME_PATTERN_DEV_INSTANCE/"{version}"/dev}
+                  echo "url=$url" >> $GITHUB_OUTPUT
+                  echo "url: $url"
 
             - id: legacy-versions
-              if: contains(fromJson(steps.json-labels.outputs.labels), github.event.label.name)
               uses: dhis2/action-supported-legacy-versions@v1
               with:
                   instance-url-latest: ${{ steps.instance-url.outputs.url }} # can be removed if maxDHIS2Version has been specified
@@ -75,40 +59,32 @@ jobs:
                   password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} # can be removed if maxDHIS2Version has been specified
 
     cypress:
-        needs: prerequisites
-        if: contains(fromJson(needs.prerequisites.outputs.json-labels), github.event.label.name)
+        needs: compute-versions
         runs-on: ubuntu-latest
         container: cypress/browsers:node14.7.0-chrome84
         strategy:
             fail-fast: false
             matrix:
-                versions: ${{ fromJSON(needs.prerequisites.outputs.versions) }}
-                containers: ${{ fromJSON(needs.prerequisites.outputs.matrix-containers) }}
+                versions: ${{ fromJSON(needs.compute-versions.outputs.versions) }}
+                containers: [1, 2, 3, 4, 5, 6]
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v1 
               with:
-                  node-version: 14.x
-
-            - uses: actions/cache@v2
-              id: yarn-cache
-              with:
-                  path: '**/node_modules'
-                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-
-            - name: Install
-              if: steps.yarn-cache.outputs.cache-hit != 'true'
-              run: yarn install --frozen-lockfile
+                  node-version: 16.x
 
             - name: compute-instance-url
               id: instance-url
-              run: echo "::set-output name=url::${BASE_URL_INSTANCES%/}/${NAME_PATTERN_LEGACY_INSTANCES/"{version}"/$version}"
+              run: |
+                  url=${BASE_URL_INSTANCES%/}/${NAME_PATTERN_LEGACY_INSTANCES/"{version}"/$version}
+                  echo "url=$url" >> $GITHUB_OUTPUT
+                  echo "url: $url"
               env:
                   version: ${{ matrix.versions }}
 
             - name: Cypress run
-              uses: cypress-io/github-action@v2
+              uses: cypress-io/github-action@v4
               with:
                   record: true
                   parallel: true
@@ -126,8 +102,11 @@ jobs:
                   CYPRESS_dhis2Username: ${{ secrets.CYPRESS_DHIS2_USERNAME }}
                   CYPRESS_dhis2Password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }}
 
-    call-e2e-tests-result:
+    e2e-tests-success:
         needs: cypress
-        uses: ./.github/workflows/e2e-tests-result.yml
-        with:
-            result: true
+        if: ${{ success() || failure() }}
+        runs-on: ubuntu-latest
+        steps:
+            - run: if [ $result != 'success' ]; then exit 1; fi;
+              env:
+                  result: ${{ needs.cypress.result }}

From 9c280bef2dbfacc09eb9a581b5e70dbd491cc67f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?=
 <joakim.melseth@gmail.com>
Date: Mon, 17 Oct 2022 16:09:44 +0200
Subject: [PATCH 4/8] chore: reorganize steps

---
 ci/e2e-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/e2e-tests.yml b/ci/e2e-tests.yml
index 05bc906..07baba7 100644
--- a/ci/e2e-tests.yml
+++ b/ci/e2e-tests.yml
@@ -42,8 +42,6 @@ jobs:
         outputs:
             versions: ${{ steps.legacy-versions.outputs.versions }}
         steps:
-            - uses: actions/checkout@v3
-
             - name: compute-instance-url
               id: instance-url
               run: |
@@ -51,6 +49,8 @@ jobs:
                   echo "url=$url" >> $GITHUB_OUTPUT
                   echo "url: $url"
 
+            - uses: actions/checkout@v3
+
             - id: legacy-versions
               uses: dhis2/action-supported-legacy-versions@v1
               with:

From 7d51c48b0137c1755eb71147eb79cb0d10016a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?=
 <joakim.melseth@gmail.com>
Date: Tue, 18 Oct 2022 13:35:31 +0200
Subject: [PATCH 5/8] chore: use CYPRESS_RECORD_KEY secret

---
 ci/e2e-tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/e2e-tests.yml b/ci/e2e-tests.yml
index 07baba7..2c2f1e5 100644
--- a/ci/e2e-tests.yml
+++ b/ci/e2e-tests.yml
@@ -4,6 +4,7 @@ name: 'dhis2: e2e tests'
 #
 # - Secrets:
 #     GITHUB_TOKEN
+#     CYPRESS_RECORD_KEY
 #     CYPRESS_DHIS2_USERNAME
 #     CYPRESS_DHIS2_PASSWORD
 #
@@ -95,7 +96,7 @@ jobs:
                   wait-on-timeout: 300
               env:
                   CI: true
-                  CYPRESS_RECORD_KEY: '6b0bce0d-a4e8-417b-bbee-9157cbe9a999'
+                  CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   CYPRESS_dhis2BaseUrl: ${{ steps.instance-url.outputs.url }}
                   CYPRESS_dhis2InstanceVersion: ${{matrix.versions}}

From 1883008ed221bb9b6589497399cd2e429304a299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?=
 <joakim.melseth@gmail.com>
Date: Fri, 4 Nov 2022 13:24:19 +0100
Subject: [PATCH 6/8] ci: skip for fork PRs

---
 ci/e2e-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/e2e-tests.yml b/ci/e2e-tests.yml
index 2c2f1e5..6202a4d 100644
--- a/ci/e2e-tests.yml
+++ b/ci/e2e-tests.yml
@@ -38,7 +38,7 @@ defaults:
 
 jobs:
     compute-versions:
-        if: github.event.pull_request.draft == false
+        if: '!github.event.pull_request.draft && !github.event.pull_request.head.repo.fork'
         runs-on: ubuntu-latest
         outputs:
             versions: ${{ steps.legacy-versions.outputs.versions }}

From 10b98053b19d90b7aa513412f0687b718c8c4a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?=
 <joakim.melseth@gmail.com>
Date: Fri, 4 Nov 2022 14:27:43 +0100
Subject: [PATCH 7/8] ci: use node 16 and chrome 106

---
 ci/e2e-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/e2e-tests.yml b/ci/e2e-tests.yml
index 6202a4d..6b66629 100644
--- a/ci/e2e-tests.yml
+++ b/ci/e2e-tests.yml
@@ -62,7 +62,7 @@ jobs:
     cypress:
         needs: compute-versions
         runs-on: ubuntu-latest
-        container: cypress/browsers:node14.7.0-chrome84
+        container: cypress/browsers:node16.17.0-chrome106
         strategy:
             fail-fast: false
             matrix:

From 1473ea3115436ea261e0b70937e9594bf60f186c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?=
 <joakim.melseth@gmail.com>
Date: Fri, 4 Nov 2022 16:10:21 +0100
Subject: [PATCH 8/8] ci: remove unnecessary step

---
 ci/e2e-tests.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ci/e2e-tests.yml b/ci/e2e-tests.yml
index 6b66629..33aa5b8 100644
--- a/ci/e2e-tests.yml
+++ b/ci/e2e-tests.yml
@@ -71,10 +71,6 @@ jobs:
         steps:
             - uses: actions/checkout@v3
 
-            - uses: actions/setup-node@v1 
-              with:
-                  node-version: 16.x
-
             - name: compute-instance-url
               id: instance-url
               run: |