From 3ff155182eda1be04c3289eb43af6c676b6f3f4e Mon Sep 17 00:00:00 2001
From: Adrian Moldovan <3854374+adimoldovan@users.noreply.github.com>
Date: Thu, 11 Jul 2024 13:45:30 +0100
Subject: [PATCH] Fix Blocks e2e environment setup in release checks (#49379)

---
 .github/workflows/ci.yml                           |  3 ++-
 .../workflows/scripts}/override-wp-env-plugins.js  | 14 +++++++++-----
 ...release-checks-override-wp-env-for-blocks-tests |  4 ++++
 plugins/woocommerce/package.json                   |  4 ++--
 4 files changed, 17 insertions(+), 8 deletions(-)
 rename {plugins/woocommerce/tests/e2e-pw/bin => .github/workflows/scripts}/override-wp-env-plugins.js (68%)
 create mode 100644 plugins/woocommerce/changelog/ci-release-checks-override-wp-env-for-blocks-tests

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a472d938660..1e03133f21e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -194,8 +194,9 @@ jobs:
         env:
           RELEASE_TAG: ${{ github.ref_name }}
           ARTIFACT_NAME: ${{ github.ref_name == 'nightly' && 'woocommerce-trunk-nightly.zip' || 'woocommerce.zip' }}
+          WP_ENV_CONFIG_PATH: ${{ matrix.projectPath }}
         working-directory: ${{ matrix.projectPath }}
-        run: node ./tests/e2e-pw/bin/override-wp-env-plugins.js
+        run: node ./github/workflows/scripts/override-wp-env-plugins.js
 
       - name: 'Start Test Environment'
         id: 'prepare-test-environment'
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/override-wp-env-plugins.js b/.github/workflows/scripts/override-wp-env-plugins.js
similarity index 68%
rename from plugins/woocommerce/tests/e2e-pw/bin/override-wp-env-plugins.js
rename to .github/workflows/scripts/override-wp-env-plugins.js
index 6f4fb9bfcdd..c35363446a0 100644
--- a/plugins/woocommerce/tests/e2e-pw/bin/override-wp-env-plugins.js
+++ b/.github/workflows/scripts/override-wp-env-plugins.js
@@ -1,6 +1,7 @@
+/* eslint-disable no-console */
 const fs = require( 'fs' );
 
-const { RELEASE_TAG, ARTIFACT_NAME } = process.env;
+const { RELEASE_TAG, ARTIFACT_NAME, WP_ENV_CONFIG_PATH } = process.env;
 
 if ( ! RELEASE_TAG ) {
 	console.error( 'Please set the RELEASE_TAG environment variable!' );
@@ -12,9 +13,12 @@ if ( ! ARTIFACT_NAME ) {
 	process.exit( 1 );
 }
 
+if ( ! WP_ENV_CONFIG_PATH ) {
+	console.error( 'Please set the WP_ENV_CONFIG_PATH environment variable!' );
+	process.exit( 1 );
+}
+
 const artifactUrl = `https://github.com/woocommerce/woocommerce/releases/download/${ RELEASE_TAG }/${ ARTIFACT_NAME }`;
-// https://github.com/woocommerce/woocommerce/releases/download/nightly/woocommerce-trunk-nightly.zip
-// https://github.com/woocommerce/woocommerce/releases/download/9.0.0-beta.2/woocommerce.zip
 
 const testEnvPlugins = {
 	env: {
@@ -23,7 +27,7 @@ const testEnvPlugins = {
 		},
 	},
 };
-const data = fs.readFileSync( '.wp-env.json', 'utf8' );
+const data = fs.readFileSync( `${ WP_ENV_CONFIG_PATH }/.wp-env.json`, 'utf8' );
 const wpEnvConfig = JSON.parse( data );
 testEnvPlugins.env.tests.plugins = wpEnvConfig.env.tests.plugins;
 
@@ -34,6 +38,6 @@ if ( currentDirEntry !== -1 ) {
 }
 
 fs.writeFileSync(
-	'.wp-env.override.json',
+	`${ WP_ENV_CONFIG_PATH }/.wp-env.override.json`,
 	JSON.stringify( testEnvPlugins, null, 2 )
 );
diff --git a/plugins/woocommerce/changelog/ci-release-checks-override-wp-env-for-blocks-tests b/plugins/woocommerce/changelog/ci-release-checks-override-wp-env-for-blocks-tests
new file mode 100644
index 00000000000..4f73f5cc6c2
--- /dev/null
+++ b/plugins/woocommerce/changelog/ci-release-checks-override-wp-env-for-blocks-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+
diff --git a/plugins/woocommerce/package.json b/plugins/woocommerce/package.json
index fa3f9fe7f3f..afc80c04526 100644
--- a/plugins/woocommerce/package.json
+++ b/plugins/woocommerce/package.json
@@ -286,7 +286,6 @@
 					"changes": [],
 					"events": [
 						"daily-checks",
-						"nightly-checks",
 						"release-checks"
 					],
 					"testEnv": {
@@ -601,7 +600,8 @@
 					"events": [
 						"pull_request",
 						"push",
-						"release-checks"
+						"release-checks",
+						"nightly-checks"
 					],
 					"report": {
 						"resultsBlobName": "blocks-e2e-report",