Merge "Fixes building docker images"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Thu, 13 Feb 2020 17:19:37 +0000 (17:19 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 13 Feb 2020 17:19:37 +0000 (17:19 +0000)
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/logging-analytics/logging-analytics.yaml

index d101fba..a171bde 100644 (file)
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
 
+- project:
+    name: dcaegen2-collectors-hv-ves-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: ubuntu1604-docker-8c-8g
+    project: 'dcaegen2/collectors/hv-ves'
+    project-name: 'dcaegen2-collectors-hv-ves'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: dcaegen2-collectors-hv-ves-clm
     java-version: openjdk11
index 5d936a8..91df1b5 100644 (file)
@@ -52,6 +52,7 @@
 #    archive-artifacts: ''
 #    build-node: ubuntu1604-docker-arm64-4c-2g
 #
+
 - project:
     name: logging-analytics-sonar
     jobs:
 
 - project:
     name: logging-analytics-pylog
-    project-name: 'logging-analytics-pylog'
+    project-name: 'logging-analytics'
     project: 'logging-analytics'
     python-version: python3
+    tox-dir: 'pylog/'
+    tox-envs: ''
     stream:
       - 'master':
           branch: 'master'
+    build-node: ubuntu1604-builder-4c-4g
     mvn-settings: 'logging-analytics-settings'
     subproject:
       - 'pylog':
-          pom: 'pylog/pom.xml'
           pattern: 'pylog/**'
-          tox-dir: pylog/
-          tox-envs: ''
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{subproject}-python-staging-{stream}'
-      - '{project-name}-{subproject}-python-release-{stream}'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
-
-- project:
-    name: logging-analytics-pylog-python
-    project-name: 'logging-analytics-pylog'
-    project: 'logging-analytics'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'logging-analytics-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
-    subproject:
-      - 'pylog':
           path: 'pylog'
-          pattern: 'pylog/**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{subproject}-python-staging-{stream}'
+      - '{project-name}-{subproject}-python-release-{stream}'
 
 - project:
     name: logging-analytics-info