Merge "Replacing docker.skip.push with skipPush"

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
index 88c2d27..0f061b9 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
@@ -31,3 +31,23 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+    name: dcaegen2-platform-mod-bpgenerator-sonar
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod-bpgenerator'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod/bpgenerator/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index ff30754..d610663 100644 (file)
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -10,10 +10,10 @@
     subproject:
       - 'azure':
           pom: 'azure/pom.xml'
-          pattern: 'azure/azure/**'
+          pattern: 'azure/**'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+#      - '{project-name}-{stream}-verify-java'
+#      - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage: