Remove job_defaults from jobs

Change-Id: Id936700af4b842d9a79db9004ed02f5d571ed17a
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml
index 1180df6..1ffc8ac 100644 (file)
--- a/jjb/armband/armband.yml
+++ b/jjb/armband/armband.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &armband_job_defaults
-    name: armband_job_defaults
+- job-template:
+    name: 'armband-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'armband-verify-{stream}'
-
-    <<: *armband_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml
index 8478802..763a43c 100644 (file)
--- a/jjb/availability/availability.yml
+++ b/jjb/availability/availability.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &availability_job_defaults
-    name: availability_job_defaults
+- job-template:
+    name: 'availability-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'availability-verify-{stream}'
-
-    <<: *availability_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index 961bcd8..5acfef3 100644 (file)
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &conductor_job_defaults
-    name: conductor_job_defaults
+- job-template:
+    name: 'conductor-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'conductor-verify-{stream}'
-
-    <<: *conductor_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml
index 654b6f0..5a1077f 100644 (file)
--- a/jjb/copper/copper.yml
+++ b/jjb/copper/copper.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &copper_job_defaults
-    name: copper_job_defaults
+- job-template:
+    name: 'copper-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'copper-verify-{stream}'
-
-    <<: *copper_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 7778ecc..86f0fad 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &doctor_job_defaults
-    name: doctor_job_defaults
+- job-template:
+    name: 'doctor-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'doctor-verify-{stream}'
-
-    <<: *doctor_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml
index 163275f..ead48fb 100644 (file)
--- a/jjb/dpacc/dpacc.yml
+++ b/jjb/dpacc/dpacc.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &dpacc_job_defaults
-    name: dpacc_job_defaults
+- job-template:
+    name: 'dpacc-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'dpacc-verify-{stream}'
-
-    <<: *dpacc_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml
index 6bbb344..5bac319 100644 (file)
--- a/jjb/fastpathmetrics/fastpathmetrics.yml
+++ b/jjb/fastpathmetrics/fastpathmetrics.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &fastpathmetrics_job_defaults
-    name: fastpathmetrics_job_defaults
+- job-template:
+    name: 'fastpathmetrics-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'fastpathmetrics-verify-{stream}'
-
-    <<: *fastpathmetrics_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml
index 7ec5853..47f4c82 100644 (file)
--- a/jjb/ipv6/ipv6.yml
+++ b/jjb/ipv6/ipv6.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &ipv6_job_defaults
-    name: ipv6_job_defaults
+- job-template:
+    name: 'ipv6-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'ipv6-verify-{stream}'
-
-    <<: *ipv6_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index d61fa10..7e05900 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -18,21 +18,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &octopus_job_defaults
-    name: octopus_job_defaults
+- job-template:
+    name: 'octopus-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'octopus-verify-{stream}'
-
-    <<: *octopus_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/oscar/oscar.yml b/jjb/oscar/oscar.yml
index 380c901..0295674 100644 (file)
--- a/jjb/oscar/oscar.yml
+++ b/jjb/oscar/oscar.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &oscar_job_defaults
-    name: oscar_job_defaults
+- job-template:
+    name: 'oscar-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'oscar-verify-{stream}'
-
-    <<: *oscar_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index 1df8b2f..663ea2d 100644 (file)
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &parser_job_defaults
-    name: parser_job_defaults
+- job-template:
+    name: 'parser-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'parser-verify-{stream}'
-
-    <<: *parser_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 2108ccd..011a28a 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &pharos_job_defaults
-    name: pharos_job_defaults
+- job-template:
+    name: 'pharos-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'pharos-verify-{stream}'
-
-    <<: *pharos_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
index 93fa331..4566f87 100644 (file)
--- a/jjb/prediction/prediction.yml
+++ b/jjb/prediction/prediction.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &prediction_job_defaults
-    name: prediction_job_defaults
+- job-template:
+    name: 'prediction-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'prediction-verify-{stream}'
-
-    <<: *prediction_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm:

diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml
index 17ddc9e..21e5b66 100644 (file)
--- a/jjb/promise/promise.yml
+++ b/jjb/promise/promise.yml
@@ -19,21 +19,14 @@
 #            branch: 'stable/brahmaputra'
 #            gs-pathname: '/brahmaputra'
 
-- job_defaults: &promise_job_defaults
-    name: promise_job_defaults
+- job-template:
+    name: 'promise-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{stream}'
-
-- job-template:
-    name: 'promise-verify-{stream}'
-
-    <<: *promise_job_defaults
-
-    parameters:
         - 'opnfv-build-defaults'
 
     scm: