Switch to use global-jjb version of clm and sonar

global-jjb now defines the clm and sonar jobs so migrate over so that we
can decommission these job templates from releng/builder.

Issue: RELENG-347
Change-Id: I16da5b7791ca0765b38a26974e20f0eeffc803fa
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 377a9d17588416924ebe0277a26c7caffa88fa36..fbad4140664a4211e6079d2625d5557f176ab042 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -3,14 +3,14 @@
 - project:
     name: distribution
     jobs:
-      # {project-name}- is generic template, distribution- is project specific.
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-sonar'
+      # gerrit- is generic template, distribution- is project specific.
       - 'distribution-merge-{stream}'
       - 'distribution-verify-{stream}'
       - 'distribution-deploy-{stream}'
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
+      - gerrit-maven-clm
+      - gerrit-maven-sonar
       - gerrit-tox-verify
 
     project: integration/distribution