X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-snmptrap.yaml;h=a5e4584a6cbc4894e426ee2ecd3cad2b34cca756;hb=d0ecf6ad60d1e6f26a12c4853fadb210943d6da8;hp=c2d604a97b2052deb78bb7e6dd40d85738964a03;hpb=a7e3565446c44e586b8c3c5c99de909272deb473;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index c2d604a97..a5e4584a6 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -1,64 +1,48 @@
 ---
 - 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'
+    project-name: "dcaegen2-collectors-snmptrap"
+    project: "dcaegen2/collectors/snmptrap"
+    python-version: python3
+    tox-dir: "."
     stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    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
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    build-node: ubuntu1804-docker-8c-8g
+    mvn-settings: "dcaegen2-collectors-snmptrap-settings"
+    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-2c-1g
+    archive-artifacts: ""
+    container-tag-method: latest
+    nexus-iq-namespace: "onap-"
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: ".*"
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    files: "**"
 
 - project:
     name: dcaegen2-collectors-snmptrap-sonar
     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'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    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
+    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"