Remove job_defaults from jobs

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

14 files changed, 28 insertions, 126 deletions

diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml
index 1180df6f8..1ffc8ac8e 100644
--- 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 847880232..763a43c6b 100644
--- 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 961bcd878..5acfef343 100644
--- 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 654b6f02a..5a1077fb9 100644
--- 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 7778ecc39..86f0fadc7 100644
--- 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 163275ffd..ead48fb73 100644
--- 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 6bbb344b0..5bac3192f 100644
--- 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 7ec58536b..47f4c8237 100644
--- 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 d61fa1033..7e05900bd 100644
--- 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 380c90197..02956741a 100644
--- 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 1df8b2fc6..663ea2da3 100644
--- 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 2108ccd4d..011a28a40 100644
--- 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 93fa33144..4566f871f 100644
--- 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 17ddc9ecb..21e5b66a4 100644
--- 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: