Merge "switch trapcollector jobs to check job trigger problem"

1 files changed, 7 insertions, 19 deletions

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 7c938f0a0..a78dcd609 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -14,20 +14,19 @@
     build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     jobs:
-      - gerrit-tox-verify
-      - gerrit-docker-verify
-      - gerrit-docker-merge
+      - '{project-name}-python-jobs'
       - '{project-name}-{stream}-release-version-java-daily'
-    files: '**'
     archive-artifacts: ''
     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: '**'
+        pattern: '.*'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+    files: '**'
 
 
 - project:
@@ -49,17 +48,6 @@
     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: