From 444b665147ebbdfa1237c09dd875052e37d2375a Mon Sep 17 00:00:00 2001
From: Carlos Garcia Ortiz karliatto <yo@karliatto.com>
Date: Wed, 21 Feb 2024 14:16:11 +0100
Subject: [PATCH] chore(ci): adjust connect-explorer-webextension

---
 ci/build.yml |  2 --
 ci/test.yml  | 24 +++++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ci/build.yml b/ci/build.yml
index 0f096868b2b..1e721066e6c 100644
--- a/ci/build.yml
+++ b/ci/build.yml
@@ -246,7 +246,6 @@ suite-desktop build windows codesign:
     - ./packages/connect-web/scripts/check-inline-build-size.sh
     - yarn workspace @trezor/connect-iframe build
     - yarn workspace @trezor/connect-popup build
-    - yarn workspace @trezor/connect-explorer-webextension build
     # build webextension examples with latest trezor.io and latest npm package
     - node ./packages/connect-examples/update-webextensions.js --trezor-connect-src "https://suite.corp.sldev.cz/connect/${CI_COMMIT_REF_NAME}/"
     # build webextension examples with latest trezor.io and outdated npm package (current production)
@@ -268,7 +267,6 @@ suite-desktop build windows codesign:
       - packages/connect-examples/webextension-mv3/build
       - packages/connect-examples/webextension-mv3/build-legacy
       - packages/connect-examples/webextension-mv3-sw/build
-      - packages/connect-explorer-webextension/build
       - packages/connect-explorer/build-webextension
 
 connect-explorer build:
diff --git a/ci/test.yml b/ci/test.yml
index 6ff71357387..787928b319c 100644
--- a/ci/test.yml
+++ b/ci/test.yml
@@ -222,7 +222,7 @@ transport manual:
 # @trezor/connect-popup (via @trezor/connect-explorer)
 .e2e connect-popup:
   stage: integration testing
-  retry: 1
+  retry: 0
   variables:
     COMPOSE_PROJECT_NAME: $CI_JOB_ID
     COMPOSE_FILE: ./docker/docker-compose.connect-popup-ci.yml
@@ -308,19 +308,21 @@ connect-popup legacy npm package:
     refs:
       - schedules
 
-.e2e connect-popup-webextension:
+.e2e connect-explorer-webextension:
   stage: integration testing
-  retry: 1
+  retry: 0
   variables:
     COMPOSE_PROJECT_NAME: $CI_JOB_ID
     COMPOSE_FILE: ./docker/docker-compose.connect-popup-ci.yml
+    TREZOR_CONNECT_SRC: ${DEV_SERVER_URL}/connect/${CI_COMMIT_REF_NAME}/
     URL: ${DEV_SERVER_URL}/connect/${CI_COMMIT_REF_NAME}/
-    __TREZOR_CONNECT_SRC: ${DEV_SERVER_URL}/connect/${CI_COMMIT_REF_NAME}/
-    TEST_FILE: $TEST_FILE
     IS_WEBEXTENSION: "true"
   script:
     - yarn install --immutable
-    - yarn workspace @trezor/connect-explorer-webextension build
+    - yarn build:libs
+    - yarn workspace @trezor/connect-webextension build
+    - yarn workspace @trezor/connect-iframe build:core-module
+    - yarn workspace @trezor/connect-explorer build:webextension
     - docker-compose pull
     - docker-compose up -d trezor-user-env-unix
     - docker-compose run test-run
@@ -342,16 +344,16 @@ connect-popup legacy npm package:
       - TEST_FILE: ["popup-close.test"]
       - TEST_FILE: ["popup-error-page.test"]
 
-connect-popup-webextension:
-  extends: .e2e connect-popup-webextension
+connect-explorer-webextension:
+  extends: .e2e connect-explorer-webextension
   dependencies:
     - install
     - connect-web build
   only:
     <<: *run_everything_rules
 
-connect-popup-webextension manual:
-  extends: .e2e connect-popup-webextension
+connect-explorer-webextension manual:
+  extends: .e2e connect-explorer-webextension
   needs:
     - install
     - connect-web build
@@ -361,7 +363,7 @@ connect-popup-webextension manual:
 
 .connect:
   stage: integration testing
-  retry: 1
+  retry: 0
   dependencies:
     - install
   variables: