SONAR-19156 Add tests to regular QA loop

diff --git a/.cirrus.yml b/.cirrus.yml
index c8fc2d1262fa6aac6692ad619568e475860871ce..02e7ed508810d85d0ed1b10c1ad13001ce0424f2 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -37,27 +37,30 @@ nightly_task_template: &NIGHTLY_TASK_TEMPLATE
 master_and_nightly_task_template: &MASTER_AND_NIGHTLY_TASK_TEMPLATE
     only_if: $CIRRUS_BRANCH == $BRANCH_NIGHTLY || $CIRRUS_BRANCH == $BRANCH_MAIN
 
+master_or_nightly_or_maintenance_task_template: &MASTER_OR_NIGHTLY_OR_MAINTENANCE_TASK_TEMPLATE
+    only_if: $CIRRUS_BRANCH == $BRANCH_NIGHTLY || $CIRRUS_BRANCH == $BRANCH_MAIN || $CIRRUS_BRANCH =~ $BRANCH_PATTERN_MAINTENANCE
+
 except_nightly_task_template: &EXCEPT_ON_NIGHTLY_TASK_TEMPLATE
   only_if: $CIRRUS_BRANCH != $BRANCH_NIGHTLY
 
-database_related_nightly_task_template: &DATABASE_RELATED_NIGHTLY_TASK_TEMPLATE
+database_related_task_template: &DATABASE_RELATED_TASK_TEMPLATE
   only_if: >-
-    $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
+    $CIRRUS_BRANCH == $BRANCH_MAIN || $CIRRUS_BRANCH =~ $BRANCH_PATTERN_MAINTENANCE || $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
     changesInclude('server/sonar-db-dao/**/*Mapper.xml', 'server/sonar-db-migration/**/DbVersion*.java', 'server/sonar-db-dao/**/*Dao.java', 'server/sonar-db-core/src/main/java/org/sonar/db/*.java')
 
-saml_nightly_task_template: &SAML_NIGHTLY_TASK_TEMPLATE
+saml_task_template: &SAML_TASK_TEMPLATE
   only_if: >-
-    $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
+    $CIRRUS_BRANCH == $BRANCH_MAIN || $CIRRUS_BRANCH =~ $BRANCH_PATTERN_MAINTENANCE || $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
     changesInclude('server/sonar-auth-saml/src/main/java/**/*.java', 'server/sonar-auth-saml/src/main/resources/**/*', 'server/sonar-db-dao/src/main/**/SAML*.java', 'private/it-core/src/test/java/org/sonarqube/tests/saml/*.java', 'server/sonar-webserver-webapi/src/main/java/org/sonar/server/saml/**/*.java')
 
-ldap_nightly_task_template: &LDAP_NIGHTLY_TASK_TEMPLATE
+ldap_task_template: &LDAP_TASK_TEMPLATE
   only_if: >-
-    $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
+    $CIRRUS_BRANCH == $BRANCH_MAIN || $CIRRUS_BRANCH =~ $BRANCH_PATTERN_MAINTENANCE || $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
     changesInclude('server/sonar-auth-ldap/src/main/java/**/*.java', 'server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/LdapCredentialsAuthentication.java', 'private/it-core/src/test/java/org/sonarqube/tests/ldap/*.java')
 
-github_nightly_task_template: &GITHUB_NIGHTLY_TASK_TEMPLATE
+github_task_template: &GITHUB_TASK_TEMPLATE
   only_if: >-
-    $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
+    $CIRRUS_BRANCH == $BRANCH_MAIN || $CIRRUS_BRANCH =~ $BRANCH_PATTERN_MAINTENANCE || $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
     changesInclude('private/core-extension-developer-server/src/main/java/com/sonarsource/branch/pr/github/*.java', 'private/it-branch/it-tests/src/test/java/com/sonarsource/branch/it/suite/pr/github/*.java')
 
 docker_build_container_template: &CONTAINER_TEMPLATE
@@ -333,7 +336,6 @@ qa_task:
 task: #bitbucket
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *NIGHTLY_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
@@ -359,7 +361,6 @@ task: #bitbucket
 qa_bb_cloud_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *NIGHTLY_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
@@ -379,7 +380,7 @@ qa_bb_cloud_task:
 qa_ha_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *NIGHTLY_TASK_TEMPLATE
+  <<: *MASTER_OR_NIGHTLY_OR_MAINTENANCE_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
@@ -415,7 +416,6 @@ qa_performance_task:
 # GitLab QA is executed in a dedicated task in order to not slow down the pipeline, as a GitLab on-prem server docker image is required.
 qa_gitlab_task:
   <<: *DEFAULT_TEMPLATE
-  <<: *NIGHTLY_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   depends_on:
@@ -466,7 +466,6 @@ qa_gitlab_task:
 qa_gitlab_cloud_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *NIGHTLY_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
@@ -488,7 +487,6 @@ qa_gitlab_cloud_task:
 qa_azure_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *NIGHTLY_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
@@ -507,7 +505,7 @@ qa_azure_task:
 qa_github_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *GITHUB_NIGHTLY_TASK_TEMPLATE
+  <<: *GITHUB_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
@@ -526,7 +524,7 @@ qa_github_task:
 qa_saml_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *SAML_NIGHTLY_TASK_TEMPLATE
+  <<: *SAML_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
@@ -553,7 +551,7 @@ qa_saml_task:
 qa_ldap_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *LDAP_NIGHTLY_TASK_TEMPLATE
+  <<: *LDAP_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
@@ -601,7 +599,7 @@ package_docker_task:
 sql_mssql_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *DATABASE_RELATED_NIGHTLY_TASK_TEMPLATE
+  <<: *DATABASE_RELATED_TASK_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
     <<: *CONTAINER_TEMPLATE
@@ -623,7 +621,7 @@ sql_mssql_task:
 sql_postgres_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *DATABASE_RELATED_NIGHTLY_TASK_TEMPLATE
+  <<: *DATABASE_RELATED_TASK_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
     <<: *CONTAINER_TEMPLATE
@@ -638,7 +636,7 @@ sql_postgres_task:
 sql_postgres11_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *DATABASE_RELATED_NIGHTLY_TASK_TEMPLATE
+  <<: *DATABASE_RELATED_TASK_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
     <<: *CONTAINER_TEMPLATE
@@ -653,7 +651,7 @@ sql_postgres11_task:
 sql_oracle21_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *DATABASE_RELATED_NIGHTLY_TASK_TEMPLATE
+  <<: *DATABASE_RELATED_TASK_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
     <<: *CONTAINER_TEMPLATE
@@ -667,7 +665,7 @@ sql_oracle21_task:
 upgd_mssql_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *DATABASE_RELATED_NIGHTLY_TASK_TEMPLATE
+  <<: *DATABASE_RELATED_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container:
@@ -693,7 +691,7 @@ upgd_mssql_task:
 upgd_oracle21_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  <<: *DATABASE_RELATED_NIGHTLY_TASK_TEMPLATE
+  <<: *DATABASE_RELATED_TASK_TEMPLATE
   <<: *JAR_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   eks_container: