From a1883b6a2304a0a69f49d52d2e0e77714f378074 Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Thu, 11 Mar 2021 18:46:21 +0200
Subject: [PATCH 01/11] Add Scheduled job for a Pre-Release Gutenberg block
 tests

---
 .github/workflows/e2e-tests.yml               |  2 +
 .../jetpack/tests/e2e/bin/container-setup.sh  | 54 +++++++++++++++++++
 projects/plugins/jetpack/tests/e2e/bin/env.sh |  7 ++-
 .../plugins/jetpack/tests/e2e/bin/wp-setup.sh | 22 --------
 4 files changed, 62 insertions(+), 23 deletions(-)
 create mode 100755 projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
 delete mode 100755 projects/plugins/jetpack/tests/e2e/bin/wp-setup.sh

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index dc0e5f2ae7914..ed31c85fef1ae 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -8,6 +8,8 @@ on:
     branches: [master]
     paths-ignore:
     - '**.md'
+  schedule:
+    - cron:  '0 */12 * * *'
 
 jobs:
   e2e-tests:
diff --git a/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh b/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
new file mode 100755
index 0000000000000..6a8215276b4bf
--- /dev/null
+++ b/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Exit if any command fails.
+set -e
+
+#####
+# This script is designed to be running inside the WP container
+# it is basically a hacky way to insert arbitrary PHP code into wp-config without messing with bash escaping etc.
+# Also, it creates a debug log file
+
+function usage {
+	echo "usage: $0 command"
+	echo "  wp-setup                     Setup wp-config"
+	echo "  gb-prerelease               Pull latest Guteberg pre-prelease"
+	echo "  -h | usage                   output this message"
+	exit 1
+}
+
+function wp_config {
+	touch wp-content/debug.log
+	chown www-data:www-data wp-content/debug.log
+	chmod 755 wp-content/debug.log
+
+	# Remove default config entries
+	sed -i '/WP_SITEURL/d' wp-config.php
+	sed -i '/WP_HOME/d' wp-config.php
+	sed -i '/WP_TESTS_DOMAIN/d' wp-config.php
+	sed -i '/E2E_REQUEST_URL/d' wp-config.php
+
+	sed -i "/\/\* That's all, stop editing! Happy publishing. \*\//i\
+	define( 'E2E_REQUEST_URL', ( ! empty( \\\$_SERVER['HTTPS'] ) ? 'https://' : 'http://' ) . ( ! empty( \\\$_SERVER['HTTP_HOST'] ) ? \\\$_SERVER['HTTP_HOST'] : 'localhost' ) );\n\
+	define( 'WP_SITEURL', E2E_REQUEST_URL );\n\
+	define( 'WP_HOME', E2E_REQUEST_URL );\n\
+	" wp-config.php
+}
+
+function gb_prerelease {
+	ZIP_PATH=${2:-"wp-content/gutenberg.zip"}
+
+	rm -rf $ZIP_PATH wp-content/plugins/gutenberg
+	BROWSER_URL=$(curl -s https://api.github.com/repos/Wordpress/gutenberg/releases/latest | grep browser_download_url | cut -d '"' -f 4)
+	curl -L $BROWSER_URL --output $ZIP_PATH
+	echo "Pre-release Gutenberg successfuly downloaded in $ZIP_PATH"
+}
+
+if [ "${1}" == "wp-config" ]; then
+	wp_config
+elif [ "${1}" == "gb-prerelease" ]; then
+	gb_prerelease
+elif [ "${1}" == "usage" ]; then
+	usage
+else
+	usage
+fi
diff --git a/projects/plugins/jetpack/tests/e2e/bin/env.sh b/projects/plugins/jetpack/tests/e2e/bin/env.sh
index 1cb98626f29f6..be91f69ee26fd 100755
--- a/projects/plugins/jetpack/tests/e2e/bin/env.sh
+++ b/projects/plugins/jetpack/tests/e2e/bin/env.sh
@@ -22,11 +22,16 @@ reset_env() {
 }
 
 configure_wp_env() {
-	yarn wp-env run tests-wordpress sh wp-content/plugins/jetpack-dev/tests/e2e/bin/wp-setup.sh
+	yarn wp-env run tests-wordpress sh wp-content/plugins/jetpack-dev/tests/e2e/bin/container-setup.sh wp-config
 
 	if [ "$GUTENBERG" == "latest" ]; then
 		echo "Installing latest Gutenberg"
 		yarn wp-env run tests-cli wp plugin install gutenberg --activate
+	elif [ "$GUTENBERG" == "pre-release" ]; then
+		GB_ZIP="wp-content/gutenberg.zip"
+		yarn wp-env run tests-wordpress "wp-content/plugins/jetpack-dev/tests/e2e/bin/container-setup.sh gb-prerelease $GB_ZIP"
+		yarn wp-env run tests-cli "wp plugin install $GB_ZIP"
+		yarn wp-env run tests-cli "wp plugin activate gutenberg"
 	fi
 
 	yarn wp-env run tests-cli wp plugin activate jetpack-dev
diff --git a/projects/plugins/jetpack/tests/e2e/bin/wp-setup.sh b/projects/plugins/jetpack/tests/e2e/bin/wp-setup.sh
deleted file mode 100755
index bb2034bca2e21..0000000000000
--- a/projects/plugins/jetpack/tests/e2e/bin/wp-setup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-#####
-# This script is designed to be running inside the WP container
-# it is basically a hacky way to insert arbitrary PHP code into wp-config without messing with bash escaping etc.
-# Also, it creates a debug log file
-
-touch wp-content/debug.log
-chown www-data:www-data wp-content/debug.log
-chmod 755 wp-content/debug.log
-
-# Remove default config entries
-sed -i '/WP_SITEURL/d' wp-config.php
-sed -i '/WP_HOME/d' wp-config.php
-sed -i '/WP_TESTS_DOMAIN/d' wp-config.php
-sed -i '/E2E_REQUEST_URL/d' wp-config.php
-
-sed -i "/\/\* That's all, stop editing! Happy publishing. \*\//i\
-define( 'E2E_REQUEST_URL', ( ! empty( \\\$_SERVER['HTTPS'] ) ? 'https://' : 'http://' ) . ( ! empty( \\\$_SERVER['HTTP_HOST'] ) ? \\\$_SERVER['HTTP_HOST'] : 'localhost' ) );\n\
-define( 'WP_SITEURL', E2E_REQUEST_URL );\n\
-define( 'WP_HOME', E2E_REQUEST_URL );\n\
-" wp-config.php

From f261401b32c838750c634b27dde66e7e110772b1 Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Tue, 23 Mar 2021 13:48:28 +0200
Subject: [PATCH 02/11] use gh action to get latest pre-release

---
 .../jetpack/tests/e2e/bin/container-setup.sh       | 14 +++++++-------
 projects/plugins/jetpack/tests/e2e/bin/env.sh      |  4 ++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh b/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
index 6a8215276b4bf..aa733c12a7aef 100755
--- a/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
+++ b/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Exit if any command fails.
-set -e
+set -eo pipefail
 
 #####
 # This script is designed to be running inside the WP container
@@ -34,19 +34,19 @@ function wp_config {
 	" wp-config.php
 }
 
-function gb_prerelease {
-	ZIP_PATH=${2:-"wp-content/gutenberg.zip"}
+function gb_setup {
+	GB_URL=${1}
+	ZIP_PATH=${2}
 
 	rm -rf $ZIP_PATH wp-content/plugins/gutenberg
-	BROWSER_URL=$(curl -s https://api.github.com/repos/Wordpress/gutenberg/releases/latest | grep browser_download_url | cut -d '"' -f 4)
-	curl -L $BROWSER_URL --output $ZIP_PATH
+	curl -L $GB_URL --output $ZIP_PATH
 	echo "Pre-release Gutenberg successfuly downloaded in $ZIP_PATH"
 }
 
 if [ "${1}" == "wp-config" ]; then
 	wp_config
-elif [ "${1}" == "gb-prerelease" ]; then
-	gb_prerelease
+elif [ "${1}" == "gb-setup" ]; then
+	gb_setup ${2} ${3}
 elif [ "${1}" == "usage" ]; then
 	usage
 else
diff --git a/projects/plugins/jetpack/tests/e2e/bin/env.sh b/projects/plugins/jetpack/tests/e2e/bin/env.sh
index be91f69ee26fd..921082dd3875d 100755
--- a/projects/plugins/jetpack/tests/e2e/bin/env.sh
+++ b/projects/plugins/jetpack/tests/e2e/bin/env.sh
@@ -34,6 +34,8 @@ configure_wp_env() {
 		yarn wp-env run tests-cli "wp plugin activate gutenberg"
 	fi
 
+configure_wp_env() {
+	yarn wp-env run tests-wordpress ./wp-content/plugins/jetpack-dev/tests/e2e/bin/container-setup.sh wp-config
 	yarn wp-env run tests-cli wp plugin activate jetpack-dev
 
 	echo
@@ -45,6 +47,8 @@ if [ "${1}" == "start" ]; then
 	start_env
 elif [ "${1}" == "reset" ]; then
 	reset_env
+elif [ "${1}" == "gb-setup" ]; then
+	gb_setup ${2}
 elif [ "${1}" == "usage" ]; then
 	usage
 else

From bd50583b9618a0d2b03c480e369295c870e0709e Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Tue, 23 Mar 2021 13:50:30 +0200
Subject: [PATCH 03/11] update slack reporter

---
 projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js b/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js
index 71d758cb27f5e..102aadeb7f882 100644
--- a/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js
+++ b/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js
@@ -21,7 +21,9 @@ export default class SlackReporter {
 		} );
 		this.runURL = `${ repoUrl }/actions/runs/${ GITHUB_RUN_ID }`;
 		this.runType =
-			GUTENBERG === 'latest' ? 'with latest :gutenberg: plugin' : 'with no :gutenberg: plugin';
+			GUTENBERG === 'pre-release'
+				? 'with pre-release :gutenberg: plugin'
+				: 'without :gutenberg: plugin';
 
 		this.mentions = mentions
 			.map( function ( userId ) {

From 01b391589a4d97c1e617323c4c939ad21826b469 Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Tue, 23 Mar 2021 13:58:56 +0200
Subject: [PATCH 04/11] fix usage output

---
 projects/plugins/jetpack/tests/e2e/bin/container-setup.sh | 4 ++--
 projects/plugins/jetpack/tests/e2e/bin/env.sh             | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh b/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
index aa733c12a7aef..192e4d9a10bd5 100755
--- a/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
+++ b/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
@@ -11,8 +11,8 @@ set -eo pipefail
 function usage {
 	echo "usage: $0 command"
 	echo "  wp-setup                     Setup wp-config"
-	echo "  gb-prerelease               Pull latest Guteberg pre-prelease"
-	echo "  -h | usage                   output this message"
+	echo "  gb-setup                     Set up Gutenberg plugin"
+	echo "  -h | usage                   Output this message"
 	exit 1
 }
 
diff --git a/projects/plugins/jetpack/tests/e2e/bin/env.sh b/projects/plugins/jetpack/tests/e2e/bin/env.sh
index 921082dd3875d..a5b75b505e2f0 100755
--- a/projects/plugins/jetpack/tests/e2e/bin/env.sh
+++ b/projects/plugins/jetpack/tests/e2e/bin/env.sh
@@ -7,6 +7,7 @@ function usage {
 	echo "usage: $0 command"
 	echo "  start                        Setup the docker containers for E2E tests"
 	echo "  reset                        Reset the containers state"
+	echo "  gb-setup                     Setup Gutenberg plugin"
 	echo "  -h | usage                   Output this message"
 	exit 1
 }

From 12b7d4e76f7dbc04a3848942fc5ad43786dce427 Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Tue, 23 Mar 2021 14:07:26 +0200
Subject: [PATCH 05/11] Add changelog

---
 .../jetpack/changelog/add-e2e-scheduled-pre-release-gb-job   | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 projects/plugins/jetpack/changelog/add-e2e-scheduled-pre-release-gb-job

diff --git a/projects/plugins/jetpack/changelog/add-e2e-scheduled-pre-release-gb-job b/projects/plugins/jetpack/changelog/add-e2e-scheduled-pre-release-gb-job
new file mode 100644
index 0000000000000..3d9e6aa8f670e
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-e2e-scheduled-pre-release-gb-job
@@ -0,0 +1,5 @@
+Significance: patch
+Type: enhancement
+Comment: E2E releated changes
+
+

From e1dceee426f73327078c9126251d6893a0b35b02 Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Fri, 16 Apr 2021 19:33:52 +0300
Subject: [PATCH 06/11] Revert back to use latest G release

---
 projects/plugins/jetpack/tests/e2e/bin/container-setup.sh | 6 +++---
 projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh b/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
index 192e4d9a10bd5..d0f8e3ec8f461 100755
--- a/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
+++ b/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
@@ -35,8 +35,8 @@ function wp_config {
 }
 
 function gb_setup {
-	GB_URL=${1}
-	ZIP_PATH=${2}
+	ZIP_PATH=${1}
+	GB_URL=$(curl -s https://api.github.com/repos/Wordpress/gutenberg/releases/latest | grep browser_download_url | cut -d '"' -f 4)
 
 	rm -rf $ZIP_PATH wp-content/plugins/gutenberg
 	curl -L $GB_URL --output $ZIP_PATH
@@ -46,7 +46,7 @@ function gb_setup {
 if [ "${1}" == "wp-config" ]; then
 	wp_config
 elif [ "${1}" == "gb-setup" ]; then
-	gb_setup ${2} ${3}
+	gb_setup
 elif [ "${1}" == "usage" ]; then
 	usage
 else
diff --git a/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js b/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js
index 102aadeb7f882..a2eb9ca0e928b 100644
--- a/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js
+++ b/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js
@@ -21,9 +21,7 @@ export default class SlackReporter {
 		} );
 		this.runURL = `${ repoUrl }/actions/runs/${ GITHUB_RUN_ID }`;
 		this.runType =
-			GUTENBERG === 'pre-release'
-				? 'with pre-release :gutenberg: plugin'
-				: 'without :gutenberg: plugin';
+			GUTENBERG === 'latest' ? 'with latest :gutenberg: plugin' : 'without :gutenberg: plugin';
 
 		this.mentions = mentions
 			.map( function ( userId ) {

From a1a7f5ea93a2e6665068a2ea2531d22ee44dbece Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Wed, 28 Apr 2021 18:30:24 +0300
Subject: [PATCH 07/11] update workflow to build a matrix in runtime

---
 .github/workflows/e2e-tests.yml               | 31 ++++++++++++++++---
 .../jetpack/tests/e2e/bin/container-setup.sh  |  4 +--
 projects/plugins/jetpack/tests/e2e/bin/env.sh | 20 +++++-------
 .../jetpack/tests/e2e/lib/reporters/slack.js  |  2 +-
 4 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index ed31c85fef1ae..263981984623f 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -12,6 +12,23 @@ on:
     - cron:  '0 */12 * * *'
 
 jobs:
+  create-matrix:
+    name: "Determine tests matrix"
+    runs-on: ubuntu-latest
+    timeout-minutes: 1  # 2021-02-03: Should only take a second.
+    outputs:
+      matrix: ${{ steps.create-matrix.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v2
+      - id: create-matrix
+        run: |
+          MATRIX=[{"group":"pre-connection" },{"group":"connection" },{"group":"post-connection" }]
+          if [ ${{ github.event_name }} == schedule ]; then
+            MATRIX=$(echo $MATRIX | jq '. + [{"group": "gutenberg"}]')
+          fi
+          echo "::set-output name=matrix::$MATRIX"
+
+
   e2e-tests:
     name: "E2E ${{ matrix.group }} tests"
     runs-on: ubuntu-latest
@@ -19,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        group: [ 'pre-connection', 'connection', 'post-connection', 'gutenberg' ]
+        include: ${{ fromJson( needs.create-matrix.outputs.matrix ) }}
     env:
       GUTENBERG: bundle # default value. Can be overridden later based on matrix.group value
     if: github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
@@ -88,8 +105,6 @@ jobs:
         yarn jetpack build plugins/jetpack -v --production
 
 
-    - name: Set Gutenberg version
-      run: if [ ${{ matrix.group }} == gutenberg ]; then echo "GUTENBERG=latest" >> $GITHUB_ENV; fi
 
     - name: Environment set-up
       working-directory: projects/plugins/jetpack/tests/e2e
@@ -98,10 +113,18 @@ jobs:
       run: |
         yarn install
         yarn test-decrypt-config
-        echo "Gutenberg: $GUTENBERG"
         yarn env-start
         yarn tunnel-on
 
+    - name: Set up Gutenberg
+      if: matrix.group == 'gutenberg'
+      working-directory: projects/plugins/jetpack/tests/e2e
+      run: |
+        export GUTENBERG=latest
+        echo "$GUTENBERG" >> $GITHUB_ENV;
+        ./bin/env.sh config-gb
+
+
     - name: Run ${{ matrix.group }} tests
       working-directory: projects/plugins/jetpack/tests/e2e
       run: yarn test-e2e --group=${{ matrix.group }}
diff --git a/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh b/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
index d0f8e3ec8f461..619aefdd8ed25 100755
--- a/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
+++ b/projects/plugins/jetpack/tests/e2e/bin/container-setup.sh
@@ -40,13 +40,13 @@ function gb_setup {
 
 	rm -rf $ZIP_PATH wp-content/plugins/gutenberg
 	curl -L $GB_URL --output $ZIP_PATH
-	echo "Pre-release Gutenberg successfuly downloaded in $ZIP_PATH"
+	echo "Latest pre-release Gutenberg successfuly downloaded in $ZIP_PATH"
 }
 
 if [ "${1}" == "wp-config" ]; then
 	wp_config
 elif [ "${1}" == "gb-setup" ]; then
-	gb_setup
+	gb_setup ${2}
 elif [ "${1}" == "usage" ]; then
 	usage
 else
diff --git a/projects/plugins/jetpack/tests/e2e/bin/env.sh b/projects/plugins/jetpack/tests/e2e/bin/env.sh
index a5b75b505e2f0..547d563b13a88 100755
--- a/projects/plugins/jetpack/tests/e2e/bin/env.sh
+++ b/projects/plugins/jetpack/tests/e2e/bin/env.sh
@@ -22,18 +22,12 @@ reset_env() {
 	configure_wp_env
 }
 
-configure_wp_env() {
-	yarn wp-env run tests-wordpress sh wp-content/plugins/jetpack-dev/tests/e2e/bin/container-setup.sh wp-config
-
-	if [ "$GUTENBERG" == "latest" ]; then
-		echo "Installing latest Gutenberg"
-		yarn wp-env run tests-cli wp plugin install gutenberg --activate
-	elif [ "$GUTENBERG" == "pre-release" ]; then
-		GB_ZIP="wp-content/gutenberg.zip"
-		yarn wp-env run tests-wordpress "wp-content/plugins/jetpack-dev/tests/e2e/bin/container-setup.sh gb-prerelease $GB_ZIP"
-		yarn wp-env run tests-cli "wp plugin install $GB_ZIP"
-		yarn wp-env run tests-cli "wp plugin activate gutenberg"
-	fi
+gb_setup() {
+	GB_ZIP="wp-content/gutenberg.zip"
+	yarn wp-env run tests-wordpress "./wp-content/plugins/jetpack-dev/tests/e2e/bin/container-setup.sh gb-setup $GB_ZIP"
+	yarn wp-env run tests-cli "wp plugin install $GB_ZIP"
+	yarn wp-env run tests-cli "wp plugin activate gutenberg"
+}
 
 configure_wp_env() {
 	yarn wp-env run tests-wordpress ./wp-content/plugins/jetpack-dev/tests/e2e/bin/container-setup.sh wp-config
@@ -49,7 +43,7 @@ if [ "${1}" == "start" ]; then
 elif [ "${1}" == "reset" ]; then
 	reset_env
 elif [ "${1}" == "gb-setup" ]; then
-	gb_setup ${2}
+	gb_setup
 elif [ "${1}" == "usage" ]; then
 	usage
 else
diff --git a/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js b/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js
index a2eb9ca0e928b..8fa86d23a899d 100644
--- a/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js
+++ b/projects/plugins/jetpack/tests/e2e/lib/reporters/slack.js
@@ -21,7 +21,7 @@ export default class SlackReporter {
 		} );
 		this.runURL = `${ repoUrl }/actions/runs/${ GITHUB_RUN_ID }`;
 		this.runType =
-			GUTENBERG === 'latest' ? 'with latest :gutenberg: plugin' : 'without :gutenberg: plugin';
+			GUTENBERG === 'latest' ? 'with latest :gutenberg: plugin' : 'with bundled :gutenberg:';
 
 		this.mentions = mentions
 			.map( function ( userId ) {

From 15fa007fd0b18b5112d8ca1498bee3b0f348e29c Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Wed, 28 Apr 2021 18:58:20 +0300
Subject: [PATCH 08/11] fix syntax error

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

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 263981984623f..ea7988ac8e0e0 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v2
       - id: create-matrix
         run: |
-          MATRIX=[{"group":"pre-connection" },{"group":"connection" },{"group":"post-connection" }]
+          MATRIX='[{"group":"pre-connection" },{"group":"connection" },{"group":"post-connection" }]'
           if [ ${{ github.event_name }} == schedule ]; then
             MATRIX=$(echo $MATRIX | jq '. + [{"group": "gutenberg"}]')
           fi

From d8c285c8a85444e1fdc7b8276f377f6b07e82a5b Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Wed, 28 Apr 2021 19:01:31 +0300
Subject: [PATCH 09/11] add some logging

---
 .github/workflows/e2e-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index ea7988ac8e0e0..b351ebf9e8f7e 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -26,6 +26,7 @@ jobs:
           if [ ${{ github.event_name }} == schedule ]; then
             MATRIX=$(echo $MATRIX | jq '. + [{"group": "gutenberg"}]')
           fi
+          echo $MATRIX
           echo "::set-output name=matrix::$MATRIX"
 
 

From 6da67b4e57729d0c1a28f1dc3347fba56c74fde2 Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Wed, 28 Apr 2021 19:02:37 +0300
Subject: [PATCH 10/11] add `needs` key

---
 .github/workflows/e2e-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index b351ebf9e8f7e..0f613ef644344 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -33,6 +33,7 @@ jobs:
   e2e-tests:
     name: "E2E ${{ matrix.group }} tests"
     runs-on: ubuntu-latest
+    needs: create-matrix
     timeout-minutes: 25  # 2021-04-16: Successful runs seem to take 11-17 minutes
     strategy:
       fail-fast: false

From 2024e8ae90bce72dbd51a5c9115ea9ee4da8e8b1 Mon Sep 17 00:00:00 2001
From: Yaroslav Kukharuk <i.kukharuk@gmail.com>
Date: Wed, 28 Apr 2021 19:21:24 +0300
Subject: [PATCH 11/11] cleanup

---
 .github/workflows/e2e-tests.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 0f613ef644344..224e1303f57af 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -106,8 +106,6 @@ jobs:
         yarn install
         yarn jetpack build plugins/jetpack -v --production
 
-
-
     - name: Environment set-up
       working-directory: projects/plugins/jetpack/tests/e2e
       env: