Create new rules to control with more granularity when install-tests are executed

.gitlab-ci.yml

@@ -550,12 +550,83 @@ workflow:
   - <<: *if_installer_tests
   - <<: *on_build_changes
 
-.on_default_new_e2e_tests:
+# Specific rules for each e2e test type
+.on_install_script_tests:
   - !reference [.except_mergequeue]
   - <<: *if_disable_e2e_tests
     when: never
   - <<: *if_installer_tests
   - <<: *on_build_changes
+  - changes:
+      paths:
+        - test/new-e2e/tests/agent-platform/install-script/**/*
+        - test/e2e-framework/**/*
+
+.on_ddot_tests:
+  - !reference [.except_mergequeue]
+  - <<: *if_disable_e2e_tests
+    when: never
+  - <<: *if_installer_tests
+  - <<: *on_build_changes
+  - changes:
+      paths:
+        - test/new-e2e/tests/agent-platform/ddot/**/*
+        - test/e2e-framework/**/*
+
+.on_step_by_step_tests:
+  - !reference [.except_mergequeue]
+  - <<: *if_disable_e2e_tests
+    when: never
+  - <<: *if_installer_tests
+  - <<: *on_build_changes
+  - changes:
+      paths:
+        - test/new-e2e/tests/agent-platform/step-by-step/**/*
+        - test/e2e-framework/**/*
+
+.on_upgrade_tests:
+  - !reference [.except_mergequeue]
+  - <<: *if_disable_e2e_tests
+    when: never
+  - <<: *if_installer_tests
+  - <<: *on_build_changes
+  - changes:
+      paths:
+        - test/new-e2e/tests/agent-platform/upgrade/**/*
+        - test/e2e-framework/**/*
+
+.on_persisting_integrations_tests:
+  - !reference [.except_mergequeue]
+  - <<: *if_disable_e2e_tests
+    when: never
+  - <<: *if_installer_tests
+  - <<: *on_build_changes
+  - changes:
+      paths:
+        - test/new-e2e/tests/agent-platform/persisting-integrations/**/*
+        - test/e2e-framework/**/*
+
+.on_rpm_tests:
+  - !reference [.except_mergequeue]
+  - <<: *if_disable_e2e_tests
+    when: never
+  - <<: *if_installer_tests
+  - <<: *on_build_changes
+  - changes:
+      paths:
+        - test/new-e2e/tests/agent-platform/rpm/**/*
+        - test/e2e-framework/**/*
+
+.on_package_signing_tests:
+  - !reference [.except_mergequeue]
+  - <<: *if_disable_e2e_tests
+    when: never
+  - <<: *if_installer_tests
+  - <<: *on_build_changes
+  - changes:
+      paths:
+        - test/new-e2e/tests/agent-platform/package-signing/**/*
+        - test/e2e-framework/**/*
 
 .security_agent_change_paths: &security_agent_change_paths
   - pkg/ebpf/**/*

.gitlab/test/e2e/e2e.yml

@@ -1025,7 +1025,7 @@ new-e2e-package-signing-debian-a7-x86_64:
   needs:
     - !reference [.needs_new_e2e_template]
     - agent_deb-x64-a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_package_signing_tests]
 
 new-e2e-package-signing-suse-a7-x86_64:
   extends:
@@ -1038,7 +1038,7 @@ new-e2e-package-signing-suse-a7-x86_64:
   needs:
     - !reference [.needs_new_e2e_template]
     - agent_suse-x64-a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_package_signing_tests]
 
 new-e2e-cspm:
   extends: .new_e2e_template

.gitlab/test/e2e_install_packages/amazonlinux.yml

@@ -22,7 +22,7 @@ new-e2e-agent-platform-install-script-amazonlinux-a7-x64:
     - .new-e2e_install_script
     - .new-e2e_amazonlinux_a7_x86_64
     - .new-e2e_agent_a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_install_script_tests]
   variables:
     FLAVOR: datadog-agent
 
@@ -93,11 +93,11 @@ new-e2e-agent-platform-ddot-amazonlinux-a7-x86_64:
     - .new_e2e_template
     - .new-e2e_ddot
     - .new-e2e_amazonlinux_a7_x86_64
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_ddot_tests]
 
 new-e2e-agent-platform-ddot-amazonlinux-a7-arm64:
   extends:
     - .new_e2e_template
     - .new-e2e_ddot
     - .new-e2e_amazonlinux_a7_arm64
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_ddot_tests]

.gitlab/test/e2e_install_packages/centos.yml

@@ -31,7 +31,7 @@ new-e2e-agent-platform-install-script-centos-a7-x86_64:
     - .new-e2e_install_script
     - .new-e2e_centos_a7_x86_64
     - .new-e2e_agent_a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_install_script_tests]
   variables:
     FLAVOR: datadog-agent
 
@@ -41,7 +41,7 @@ new-e2e-agent-platform-install-script-centos-iot-agent-a7-x86_64:
     - .new-e2e_install_script
     - .new-e2e_centos_a7_x86_64
     - .new-e2e_agent_a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_install_script_tests]
   variables:
     FLAVOR: datadog-iot-agent
 
@@ -69,7 +69,7 @@ new-e2e-agent-platform-install-script-centos-fips-a7-x86_64:
     - .new-e2e_install_script
     - .new-e2e_centos-fips_a7_x86_64
     - .new-e2e_agent_a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_install_script_tests]
   variables:
     FLAVOR: datadog-agent
 
@@ -79,7 +79,7 @@ new-e2e-agent-platform-install-script-centos-fips-iot-agent-a7-x86_64:
     - .new-e2e_install_script
     - .new-e2e_centos-fips_a7_x86_64
     - .new-e2e_agent_a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_install_script_tests]
   variables:
     FLAVOR: datadog-iot-agent
 
@@ -174,11 +174,11 @@ new-e2e-agent-platform-rpm-centos6-a7-x86_64:
     - .new-e2e_rpm
     - .new-e2e_centos6_a7_x86_64
     - .new-e2e_agent_a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_rpm_tests]
 
 new-e2e-agent-platform-ddot-centos-a7-x86_64:
   extends:
     - .new_e2e_template
     - .new-e2e_ddot
     - .new-e2e_centos_a7_x86_64
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_ddot_tests]

.gitlab/test/e2e_install_packages/debian.yml

@@ -22,7 +22,7 @@ new-e2e-agent-platform-install-script-debian-a7-x86_64:
     - .new-e2e_install_script
     - .new-e2e_debian_a7_x86_64
     - .new-e2e_agent_a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_install_script_tests]
   variables:
     FLAVOR: datadog-agent
 
@@ -51,7 +51,7 @@ new-e2e-agent-platform-install-script-debian-iot-agent-a7-x86_64:
     - .new-e2e_install_script
     - .new-e2e_debian_a7_x86_64
     - .new-e2e_agent_a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_install_script_tests]
   variables:
     FLAVOR: datadog-iot-agent
 
@@ -131,11 +131,11 @@ new-e2e-agent-platform-ddot-debian-a7-x86_64:
     - .new_e2e_template
     - .new-e2e_ddot
     - .new-e2e_debian_a7_x86_64
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_ddot_tests]
 
 new-e2e-agent-platform-ddot-debian-a7-arm64:
   extends:
     - .new_e2e_template
     - .new-e2e_ddot
     - .new-e2e_debian_a7_arm64
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_ddot_tests]

.gitlab/test/e2e_install_packages/docker.yml

@@ -4,7 +4,7 @@ new-e2e-agent-platform-install-script-docker:
     - .new_e2e_template_needs_deb_x64
     - .new-e2e_agent_a7
     - .new-e2e_install_script
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_install_script_tests]
   variables:
     E2E_DESCRIPTORS: "docker/x86_64/none"
     E2E_BRANCH_DESCRIPTORS: "docker/x86_64/none"

.gitlab/test/e2e_install_packages/suse.yml

@@ -22,7 +22,7 @@ new-e2e-agent-platform-install-script-suse-a7-x86_64:
     - .new-e2e_install_script
     - .new-e2e_suse_a7_x86_64
     - .new-e2e_agent_a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_install_script_tests]
   variables:
     FLAVOR: datadog-agent
 
@@ -42,7 +42,7 @@ new-e2e-agent-platform-install-script-suse-iot-agent-a7-x86_64:
     - .new-e2e_install_script
     - .new-e2e_suse_a7_x86_64
     - .new-e2e_agent_a7
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_install_script_tests]
   variables:
     FLAVOR: datadog-iot-agent
 
@@ -117,11 +117,11 @@ new-e2e-agent-platform-ddot-suse-a7-x86_64:
     - .new_e2e_template
     - .new-e2e_ddot
     - .new-e2e_suse_a7_x86_64
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_ddot_tests]
 
 new-e2e-agent-platform-ddot-suse-a7-arm64:
   extends:
     - .new_e2e_template
     - .new-e2e_ddot
     - .new-e2e_suse_a7_arm64
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_ddot_tests]

.gitlab/test/e2e_install_packages/ubuntu.yml

@@ -23,7 +23,7 @@ new-e2e-agent-platform-install-script-ubuntu-a7-x86_64:
     - .new-e2e_ubuntu_a7_x86_64
     - .new-e2e_agent_a7
   rules:
-    !reference [.on_default_new_e2e_tests]
+    !reference [.on_install_script_tests]
   variables:
     FLAVOR: datadog-agent
 
@@ -132,7 +132,7 @@ new-e2e-agent-platform-ddot-ubuntu-a7-x86_64:
     - .new_e2e_template
     - .new-e2e_ddot
     - .new-e2e_ubuntu_a7_x86_64
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_ddot_tests]
   variables:
     E2E_OSDESCRIPTORS: "ubuntu/x86_64/16-04,ubuntu/x86_64/18-04,ubuntu/x86_64/20-04,ubuntu/x86_64/22-04,ubuntu/x86_64/24-04"
 
@@ -141,4 +141,4 @@ new-e2e-agent-platform-ddot-ubuntu-a7-arm64:
     - .new_e2e_template
     - .new-e2e_ddot
     - .new-e2e_ubuntu_a7_arm64
-  rules: !reference [.on_default_new_e2e_tests]
+  rules: !reference [.on_ddot_tests]

.gitlab/test/e2e_install_packages/windows.yml

@@ -125,21 +125,6 @@ new-e2e-windows-agent-a7-x86_64-fips:
     - !reference [.manual]
   timeout: 1h15m
 
-## single test for PRs
-## skipped if the full tests are running
-new-e2e-windows-agent-msi-upgrade-windows-server-a7-x86_64:
-  stage: e2e_install_packages
-  extends:
-    - .new-e2e_windows_msi
-    - .new-e2e_windows_a7_x86_64
-  rules:
-    - !reference [.except_main_release_or_mq]
-    - !reference [.except_windows_installer_changes]
-    - !reference [.on_default_new_e2e_tests]
-    - !reference [.except_deploy]
-  variables:
-    E2E_MSI_TEST: TestUpgrade
-
 # OCI tests
 new-e2e-windows-ddot-package-a7-x86_64:
   stage: e2e_install_packages