Merge "[SDC] Fix Sonar and CLM builds"

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 25449e8..a9efd72 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -18,6 +18,7 @@
       - 'honolulu':
           branch: 'honolulu'
     java-version: openjdk11
+    maven-version: 'mvn35'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true

diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index c694f35..d142a34 100644 (file)
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -18,10 +18,12 @@
           branch: 'honolulu'
           java-version: openjdk11
     functionality:
-      - 'integration-testing':
-          trigger_jobs:
-      - 'integration-etsi-testing':
-          trigger_jobs:
+# integration testing suites disabled until brought up to date,
+# see https://jira.onap.org/browse/SO-3632
+#      - 'integration-testing':
+#          trigger_jobs:
+#      - 'integration-etsi-testing':
+#          trigger_jobs:
       - 'macroflow':
           trigger_jobs:
     robot-options: ''