X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdpacc%2Fdpacc.yml;h=a9a09141366f077e0e1aab6a84a71a7424459584;hb=10e9fe10fa18ce8a2199eff09e3cd7dce44db84f;hp=27f298c740a2d85752cf0638b0867e8abf61c656;hpb=0b27c3e7e7ada718ba16a8ec78edfed52ae0bf15;p=releng.git

diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml
index 27f298c74..a9a091413 100644
--- a/jjb/dpacc/dpacc.yml
+++ b/jjb/dpacc/dpacc.yml
@@ -1,136 +1,8 @@
+---
 - project:
     name: dpacc
-    jobs:
-        - 'dpacc-test'
-        - 'dpacc-daily-{stream}'
-        - 'dpacc-merge'
-        - 'dpacc-verify'
-
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
-    stream:
-        - master:
-            branch: 'master'
-
-    project: 'dpacc'
-    somevar: 'foo'
-
-- job-template:
-    name: dpacc-test
-
-    builders:
-        - shell: |
-            echo "Hello world from dpacc"
-
-- job-template:
-    name: 'dpacc-daily-{stream}'
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-
-    varsetabove: '{somevar}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    triggers:
-        - timed: 'H H * * *'
-
-    prebuilders:
-        - test-macro
 
-    builders:
-        - shell: |
-            pwd
-            find .
-            echo "Hello world from dpacc {somevar} daily"
+    project: '{name}'
 
-    postbuilders:
-        - test-macro
-
-- job-template:
-    name: 'dpacc-verify'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'dpacc'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
-
-    builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
-
-- job-template:
-    name: 'dpacc-merge'
-
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'dpacc'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-
-    builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
+    jobs:
+      - '{project}-verify-basic'