From c0a5a56e0da2c4ba67f07ac95470b456fa73e50e Mon Sep 17 00:00:00 2001 From: Branden Clark Date: Tue, 26 Nov 2024 13:04:25 -0500 Subject: [PATCH 1/2] add parallel matrix --- .gitlab/e2e/e2e.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab/e2e/e2e.yml b/.gitlab/e2e/e2e.yml index aa3c21938b4ce..42a60478cf2bd 100644 --- a/.gitlab/e2e/e2e.yml +++ b/.gitlab/e2e/e2e.yml @@ -410,6 +410,20 @@ new-e2e-installer-windows: TARGETS: ./tests/installer/windows TEAM: fleet FLEET_INSTALL_METHOD: "windows" + parallel: + matrix: + # agent-package + - EXTRA_PARAMS: --run TestAgentInstallsWithAgentUser + - EXTRA_PARAMS: --run TestAgentInstalls + - EXTRA_PARAMS: --run TestAgentUpgrades + # install-script + - EXTRA_PARAMS: --run TestInstallScriptWithAgentUser + # installer-package + - EXTRA_PARAMS: --run TestInstaller + - EXTRA_PARAMS: --run TestInstallerRollback + - EXTRA_PARAMS: --run TestInstallerSystemIntegrity + - EXTRA_PARAMS: --run TestInstallerUpgrades + new-e2e-installer-ansible: extends: .new_e2e_template @@ -468,6 +482,10 @@ new-e2e-windows-systemprobe: TARGETS: ./tests/sysprobe-functional TEAM: windows-kernel-integrations SHOULD_RUN_IN_FLAKES_FINDER: "false" # Currently broken in flake finder ADXT-687 + parallel: + matrix: + - EXTRA_PARAMS: --run TestUSMAutoTaggingSuite + - EXTRA_PARAMS: --run TestVMSuite new-e2e-windows-security-agent: extends: .new_e2e_template From 560b24ce2453176c5d24a74d338df85128888823 Mon Sep 17 00:00:00 2001 From: Branden Clark Date: Tue, 26 Nov 2024 15:57:43 -0500 Subject: [PATCH 2/2] fix prefix match issue --- .gitlab/e2e/e2e.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab/e2e/e2e.yml b/.gitlab/e2e/e2e.yml index 42a60478cf2bd..09f76ab1c08b4 100644 --- a/.gitlab/e2e/e2e.yml +++ b/.gitlab/e2e/e2e.yml @@ -413,16 +413,16 @@ new-e2e-installer-windows: parallel: matrix: # agent-package - - EXTRA_PARAMS: --run TestAgentInstallsWithAgentUser - - EXTRA_PARAMS: --run TestAgentInstalls - - EXTRA_PARAMS: --run TestAgentUpgrades + - EXTRA_PARAMS: --run "TestAgentInstallsWithAgentUser$" + - EXTRA_PARAMS: --run "TestAgentInstalls$" + - EXTRA_PARAMS: --run "TestAgentUpgrades$" # install-script - - EXTRA_PARAMS: --run TestInstallScriptWithAgentUser + - EXTRA_PARAMS: --run "TestInstallScriptWithAgentUser$" # installer-package - - EXTRA_PARAMS: --run TestInstaller - - EXTRA_PARAMS: --run TestInstallerRollback - - EXTRA_PARAMS: --run TestInstallerSystemIntegrity - - EXTRA_PARAMS: --run TestInstallerUpgrades + - EXTRA_PARAMS: --run "TestInstaller$" + - EXTRA_PARAMS: --run "TestInstallerRollback$" + - EXTRA_PARAMS: --run "TestInstallerSystemIntegrity$" + - EXTRA_PARAMS: --run "TestInstallerUpgrades$" new-e2e-installer-ansible: