[NO JIRA] Allow 9.9 nightly builds to run the full QA

diff --git a/.cirrus.yml b/.cirrus.yml
index 6b88778c0da337f4636b77e0934d0d97cb4d6bbe..e9eb0bc61ec57882be79c3df9e5fd9cb8689c379 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -22,9 +22,9 @@ env:
   ELASTIC_PWD: VAULT[development/team/sonarqube/kv/data/elasticsearch-cloud data.password]
   CIRRUS_LOG_TIMESTAMP: true
   BRANCH_MAIN: 'master'
-  BRANCH_NIGHTLY: 'branch-nightly-build'
   BRANCH_PATTERN_MAINTENANCE: 'branch-.*'
   BRANCH_PATTERN_PUBLIC: 'public_.*'
+  NIGHTLY_99_CRON: '9-9-lts-nightly'
 
 auto_cancellation: $CIRRUS_BRANCH != $BRANCH_MAIN && $CIRRUS_BRANCH !=~ $BRANCH_PATTERN_MAINTENANCE
 
@@ -35,29 +35,29 @@ build_dependant_task_template: &BUILD_DEPENDANT_TASK_TEMPLATE
   depends_on: build
 
 nightly_task_template: &NIGHTLY_TASK_TEMPLATE
-  only_if: $CIRRUS_BRANCH == $BRANCH_NIGHTLY
+  only_if: $CIRRUS_CRON == $NIGHTLY_99_CRON
 
 except_nightly_task_template: &EXCEPT_ON_NIGHTLY_TASK_TEMPLATE
-  only_if: $CIRRUS_BRANCH != $BRANCH_NIGHTLY
+  only_if: $CIRRUS_CRON != $NIGHTLY_99_CRON
 
 database_related_nightly_task_template: &DATABASE_RELATED_NIGHTLY_TASK_TEMPLATE
   only_if: >-
-    $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
+    $CIRRUS_CRON == $NIGHTLY_99_CRON ||
     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
   only_if: >-
-    $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
+    $CIRRUS_CRON == $NIGHTLY_99_CRON ||
     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
   only_if: >-
-    $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
+    $CIRRUS_CRON == $NIGHTLY_99_CRON ||
     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
   only_if: >-
-    $CIRRUS_BRANCH == $BRANCH_NIGHTLY ||
+    $CIRRUS_CRON == $NIGHTLY_99_CRON ||
     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: &GKE_CONTAINER_TEMPLATE
@@ -681,7 +681,7 @@ ws_scan_task:
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
   only_if: >-
     $CIRRUS_BRANCH == $BRANCH_MAIN ||
-    ($CIRRUS_BRANCH =~ $BRANCH_PATTERN_MAINTENANCE && $CIRRUS_BRANCH != $BRANCH_NIGHTLY)
+    ($CIRRUS_BRANCH =~ $BRANCH_PATTERN_MAINTENANCE && $CIRRUS_CRON != $NIGHTLY_99_CRON)
   <<: *YARN_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   timeout_in: 30m