12 files changed, 4 insertions, 109 deletions
diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index b8ccf73c5..913c798ea 100644
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -5,7 +5,8 @@
     subproject: 'aaf-sms-client'
     path: 'sms-service/src'
     jobs:
-      - gerrit-maven-clm
+      - gerrit-maven-clm:
+          mvn-params: '-f sms-client/java/pom.xml'
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily':
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
deleted file mode 100644
index 12e13a55a..000000000
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
-    name: dcaegen2-services-pm-mapper
-    # job template iterators
-    project-name: 'dcaegen2-services-pm-mapper'
-    stream:
-      - 'master':
-          branch: 'master'
-    # apply to all jobs
-    project: 'dcaegen2/services/pm-mapper'
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-    files: '**'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - gerrit-maven-clm
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-verify-java':
-          mvn-goals: 'clean install'
-      - '{project-name}-{stream}-merge-java':
-          mvn-goals: 'clean deploy'
-
-- project:
-    name: dcaegen2-services-pm-mapper-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/services/pm-mapper'
-    project-name: 'dcaegen2-services-pm-mapper'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index 538885ff5..53409de34 100644
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -3,7 +3,6 @@
     name: doc
     project-name: 'doc'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-rtd':
           build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-merge-rtd'
diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml
deleted file mode 100644
index fac83caed..000000000
--- a/jjb/integration/integration-seccom.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: integration-seccom
-    project-name: 'integration-seccom'
-    jobs:
-      - gerrit-maven-clm
-    project: 'integration/seccom'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'integration-seccom-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 6c700fb61..e97f0abd7 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -3,7 +3,8 @@
     name: integration
     project-name: 'integration'
     jobs:
-      - gerrit-maven-clm
+      - gerrit-maven-clm:
+          mvn-params: '-f version-manifest/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index 6bd492489..0746bca62 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -11,7 +11,6 @@
     name: sdc-sdc-pubsub
     project-name: 'sdc-sdc-pubsub'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
     project: 'sdc/sdc-pubsub'
diff --git a/jjb/so/so-chef-repo.yaml b/jjb/so/so-chef-repo.yaml
deleted file mode 100644
index 08acb5463..000000000
--- a/jjb/so/so-chef-repo.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-chef-repo
-    project-name: 'so-chef-repo'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/chef-repo'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-chef-repo-settings'
-    files: '**'
-    archive-artifacts: ''
diff --git a/jjb/so/so-docker-config.yaml b/jjb/so/so-docker-config.yaml
deleted file mode 100644
index 0d61fc4e9..000000000
--- a/jjb/so/so-docker-config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-docker-config
-    project-name: 'so-docker-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/docker-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-docker-config-settings'
-    files: '**'
-    archive-artifacts: ''
diff --git a/jjb/so/so-so-config.yaml b/jjb/so/so-so-config.yaml
deleted file mode 100644
index bf63719b2..000000000
--- a/jjb/so/so-so-config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-so-config
-    project-name: 'so-so-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/so-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-so-config-settings'
-    files: '**'
-    archive-artifacts: ''
diff --git a/jjb/testsuite/testsuite-properties.yaml b/jjb/testsuite/testsuite-properties.yaml
deleted file mode 100644
index 252a2493e..000000000
--- a/jjb/testsuite/testsuite-properties.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: testsuite-properties-master
-    project-name: 'testsuite-properties'
-    jobs:
-      - gerrit-maven-clm
-    project: 'testsuite/properties'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'testsuite-properties-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index d5875a258..400170c21 100644
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -7,7 +7,6 @@
           path: '.'
           pattern: '**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
 
     project: 'testsuite/python-testing-utils'
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 92d5ffa47..f4a4652c8 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -3,7 +3,6 @@
     name: testsuite
     project-name: 'testsuite'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-3scm-docker-shell-daily':
           script:
             !include-raw-escape: 'testsuite-docker.sh'