From 155f0f695741a703f8098585bc3060ea2265e66c Mon Sep 17 00:00:00 2001 From: seaona Date: Thu, 31 Oct 2024 12:00:57 +0100 Subject: [PATCH 1/3] skip quality e2e --- .circleci/scripts/git-diff-develop.ts | 4 ++++ test/e2e/tests/request-queuing/ui.spec.js | 1 + 2 files changed, 5 insertions(+) diff --git a/.circleci/scripts/git-diff-develop.ts b/.circleci/scripts/git-diff-develop.ts index 43435db17418..2720c369b95d 100644 --- a/.circleci/scripts/git-diff-develop.ts +++ b/.circleci/scripts/git-diff-develop.ts @@ -20,6 +20,7 @@ type PRInfo = { ref: string; }; body: string; + labels: { name: string }[]; }; /** @@ -140,6 +141,9 @@ async function storeGitDiffOutputAndPrBody() { console.log(`This is for a PR targeting '${baseRef}', skipping git diff`); writePrBodyToFile(prInfo.body); return; + } else if (prInfo.labels.some(label => label.name === 'skip-e2e-quality-gate')) { + console.log('PR has the skip-e2e-quality-gate label, skipping git diff'); + return; } console.log('Attempting to get git diff...'); diff --git a/test/e2e/tests/request-queuing/ui.spec.js b/test/e2e/tests/request-queuing/ui.spec.js index b857d4307d5b..855c39bd7fbc 100644 --- a/test/e2e/tests/request-queuing/ui.spec.js +++ b/test/e2e/tests/request-queuing/ui.spec.js @@ -99,6 +99,7 @@ async function selectDappClickSend(driver, dappUrl) { async function selectDappClickPersonalSign(driver, dappUrl) { await driver.switchToWindowWithUrl(dappUrl); + await driver.delay(5000); await driver.clickElement('#personalSign'); } From 88b64abbd4ef3f670e5772bf479b23f9e706c255 Mon Sep 17 00:00:00 2001 From: seaona Date: Thu, 31 Oct 2024 12:04:11 +0100 Subject: [PATCH 2/3] add changes back --- test/e2e/tests/request-queuing/ui.spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/e2e/tests/request-queuing/ui.spec.js b/test/e2e/tests/request-queuing/ui.spec.js index 855c39bd7fbc..b857d4307d5b 100644 --- a/test/e2e/tests/request-queuing/ui.spec.js +++ b/test/e2e/tests/request-queuing/ui.spec.js @@ -99,7 +99,6 @@ async function selectDappClickSend(driver, dappUrl) { async function selectDappClickPersonalSign(driver, dappUrl) { await driver.switchToWindowWithUrl(dappUrl); - await driver.delay(5000); await driver.clickElement('#personalSign'); } From 33b2cecaeafd480f51155931505b3da29457275d Mon Sep 17 00:00:00 2001 From: seaona Date: Thu, 31 Oct 2024 12:11:01 +0100 Subject: [PATCH 3/3] change title --- .circleci/scripts/git-diff-develop.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/scripts/git-diff-develop.ts b/.circleci/scripts/git-diff-develop.ts index 2720c369b95d..f4437d6154db 100644 --- a/.circleci/scripts/git-diff-develop.ts +++ b/.circleci/scripts/git-diff-develop.ts @@ -124,7 +124,7 @@ async function storeGitDiffOutputAndPrBody() { fs.mkdirSync(CHANGED_FILES_DIR, { recursive: true }); console.log( - `Determining whether this run is for a PR targeting ${MAIN_BRANCH}`, + `Determining whether to run git diff...`, ); if (!PR_NUMBER) { console.log('Not a PR, skipping git diff');