From 75a0e0336a4c4d1edb9c926c375cdc77eddea0eb Mon Sep 17 00:00:00 2001
From: Mathieu Suen <mathieu.suen@sonarsource.com>
Date: Wed, 25 Jan 2023 14:35:51 +0100
Subject: [PATCH] [NO JIRA] Exclude test from Mend scan

(cherry picked from commit 588081d77d65c6d3a127a9b81582f929b5c0d8f3)
---
 .cirrus.yml              | 11 ++++++-----
 wss-unified-agent.config |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 15b34631a2f..772f20ad2fc 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -683,10 +683,11 @@ upgd_oracle21_task:
     - ./private/cirrus/cirrus-qa.sh oracle21
   <<: *DEFAULT_ARTIFACTS_TEMPLATE
 
-ws_scan_task:
+mend_scan_task:
   <<: *DEFAULT_TEMPLATE
   <<: *BUILD_DEPENDANT_TASK_TEMPLATE
-  only_if: $CIRRUS_BRANCH == $BRANCH_MAIN || $CIRRUS_BRANCH =~ $BRANCH_PATTERN_MAINTENANCE
+  only_if: >-
+    $CIRRUS_BRANCH == $BRANCH_MAIN || ($CIRRUS_BRANCH =~ $BRANCH_PATTERN_MAINTENANCE && $CIRRUS_BRANCH != $BRANCH_NIGHTLY)
   <<: *YARN_CACHE_TEMPLATE
   <<: *GRADLE_CACHE_TEMPLATE
   timeout_in: 30m
@@ -699,12 +700,12 @@ ws_scan_task:
     WS_WSS_URL: VAULT[development/kv/data/mend data.url]
     WS_USERKEY: VAULT[development/kv/data/mend data.userKey]
     SLACK_WEBHOOK_SQ: VAULT[development/kv/data/slack data.webhook]
-  whitesource_script:
-    - ./private/cirrus/cirrus-whitesource-scan.sh
+  mend_script:
+    - ./private/cirrus/cirrus-mend-scan.sh
   allow_failures: "true"
   on_failure:
     slack_notification_script:
-      - ./private/cirrus/cirrus-whitesource-notifications.sh
+      - ./private/cirrus/cirrus-mend-notifications.sh
   always:
     ws_artifacts:
       path: "whitesource/**/*"
diff --git a/wss-unified-agent.config b/wss-unified-agent.config
index b51650e3283..1b8848573b2 100644
--- a/wss-unified-agent.config
+++ b/wss-unified-agent.config
@@ -1,4 +1,4 @@
-# WhiteSource documentation https://whitesource.atlassian.net/wiki/spaces/WD/pages/1544880156/Unified+Agent+Configuration+Parameters
+# Mend documentation https://docs.mend.io/bundle/unified_agent/page/unified_agent_configuration_parameters.html
 
 excludes=**/*it-* **/*test*
 includes=**/*.java **/*.js **/*.ts
@@ -8,8 +8,8 @@ gradle.resolveDependencies=True
 gradle.aggregateModules=True
 gradle.preferredEnvironment=wrapper
 gradle.innerModulesAsDependencies=True
-gradle.ignoredConfigurations=.*it.*
-gradle.excludeModules=.*it.*
+gradle.ignoredConfigurations=.*test.*
+gradle.excludeModules=.*it-.* .*ut-monitoring.* .*sonar-ws-generator.* .*sonar-testing-ldap.* .*sonar-testing-harness.*
 
 npm.includeDevDependencies=False
 npm.resolveDependencies=True
-- 
2.39.5