From 62d5bf9536dd7e03be5b7bd5770e930a97ba10fa Mon Sep 17 00:00:00 2001
From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 10 Jan 2018 10:06:35 -0800
Subject: Reduce Basic Job Duplication

In the initial formation of projects we found it easy to copy job
definitions to provide project a baseline job config to work off. This
has led to a lot of duplication and misalignment with the gerrit
triggers and default build server tag to be used.

Collapsing these jobs into a job-group containing the stream and a
verify job per-stream, should help reduce this duplication.

Change-Id: Icb366487590a145be4cbfc0637a8d86a6d9b7cec
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---
 jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml | 48 +----------------------
 1 file changed, 1 insertion(+), 47 deletions(-)

(limited to 'jjb/vnf_forwarding_graph')

diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
index 7f21032e2..b11c20f62 100644
--- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
+++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
@@ -5,50 +5,4 @@
     project: '{name}'
 
     jobs:
-      - 'vnf_forwarding_graph-verify-{stream}'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-      - euphrates:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-
-- job-template:
-    name: 'vnf_forwarding_graph-verify-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-    scm:
-      - git-scm-gerrit
-
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          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: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-
-    builders:
-      - shell: |
-          echo "Nothing to verify!"
+      - '{project}-verify-basic'
-- 
cgit 1.2.3-korg