From: Fatih Degirmenci <fdegir@gmail.com>
Date: Thu, 6 Sep 2018 21:03:39 +0000 (+0000)
Subject: Merge "Move global-jjb parameter from releng to global"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=02b2a1bca2b0febdf843750c8a76dc203ae604aa;hp=d1198dfb66c99f89103cf2ed219f2f82c0fca224;p=releng.git

Merge "Move global-jjb parameter from releng to global"
---

diff --git a/jjb/global/releng-defaults.yaml b/jjb/global/releng-defaults.yaml
index 2e94767e8..0caa3f29b 100644
--- a/jjb/global/releng-defaults.yaml
+++ b/jjb/global/releng-defaults.yaml
@@ -11,6 +11,13 @@
 
     node: master
 
+    # Defaults for global-jjb jobs
+    build-node: 'opnfv-build'
+    gerrit-server-name: 'gerrit.opnfv.org'
+    jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
+    jjb-version: '2.0.3'
+    lftools-version: '<1.0.0'
+
     properties:
       - logrotate-default
 
diff --git a/jjb/releng/releng-ci-jobs.yaml b/jjb/releng/releng-ci-jobs.yaml
index 49abd7dd4..17fb6e42c 100644
--- a/jjb/releng/releng-ci-jobs.yaml
+++ b/jjb/releng/releng-ci-jobs.yaml
@@ -5,11 +5,6 @@
     project-name: 'releng'
 
     build-timeout: 60
-    build-node: 'lf-build1'
-    gerrit-server-name: 'gerrit.opnfv.org'
-    jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
-    jjb-version: '2.0.3'
-    lftools-version: '<1.0.0'
 
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-releng/38594/'
     rtd-token: '291c6a0109493b4457e566d06141212452c65784'