X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-snmptrap.yaml;h=7f21bbe85ac8a0a47a47638b01ee20d33f2d4393;hb=ca5ca7305a32799c586c510c4865b610591301d4;hp=d6891db6789e3361d747e592786ca44444900a0e;hpb=9fd40df8bd0c7dc5b4feabb23ee108439cabaccc;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index d6891db67..7f21bbe85 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -2,35 +2,70 @@
 - project:
     name: dcaegen2-collectors-snmptrap
     project-name: 'dcaegen2-collectors-snmptrap'
-    jobs:
-      - gerrit-maven-clm
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
     project: 'dcaegen2/collectors/snmptrap'
+    python-version: python3
+    tox-dir: '.'
+    tox-envs: 'py3'
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+    build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
+    jobs:
+      - gerrit-tox-verify:
+          stream: all
+          branch: '*'
+      - gerrit-docker-verify
+      - gerrit-docker-merge
+      - '{project-name}-{stream}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    container-tag-method: latest
+    docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
+    nexus-iq-namespace: 'onap-'
+    docker-root: '.'
+    docker-name: onap/org.onap.dcaegen2.collectors.snmptrap
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '**'
+
 
 - project:
     name: dcaegen2-collectors-snmptrap-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    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-builder-4c-4g
     project: 'dcaegen2/collectors/snmptrap'
     project-name: 'dcaegen2-collectors-snmptrap'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-collectors-snmptrap-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: dcaegen2/collectors/snmptrap
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: 'dcaegen2-collectors-snmptrap'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
+
+- project:
+    name: dcaegen2-collectors-snmptrap-info
+    project-name: dcaegen2-collectors-snmptrap
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: dcaegen2/collectors/snmptrap
+    branch: master