X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-snmptrap.yaml;h=911be77a33ebe45ddb698e20ae8e2c1fa80f745c;hb=ffc3ac818c92944c9b956633550a461457d10d36;hp=b94302f9101d78fdac3e2e27d583f547d5b860e5;hpb=e64812608bf097f09d10bbc8d4518c2d9ed7a921;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index b94302f91..911be77a3 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -2,26 +2,34 @@
 - project:
     name: dcaegen2-collectors-snmptrap
     project-name: 'dcaegen2-collectors-snmptrap'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
     project: 'dcaegen2/collectors/snmptrap'
+    python-version: python3
+    tox-dir: '.'
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
+    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
+    jobs:
+      - '{project-name}-python-jobs':
+               pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    archive-artifacts: ''
+    container-tag-method: latest
+    nexus-iq-namespace: 'onap-'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '.*'
     maven-deploy-properties: |
       deployAtEnd=true
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+
 
 - project:
     name: dcaegen2-collectors-snmptrap-sonar
@@ -33,7 +41,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/collectors/snmptrap'
     project-name: 'dcaegen2-collectors-snmptrap'
     branch: 'master'
@@ -41,17 +49,6 @@
     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: ubuntu1604-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