From: Aric Gardner <agardner@linuxfoundation.org>
Date: Thu, 8 Nov 2018 19:22:17 +0000 (+0000)
Subject: Merge "Install Collectd on CentOS Build Servers"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ca91aeb38454d0b85bfe01e08c911c858d11b82c;hp=a9029883891dc37cbb321892c9b6295715590234;p=releng.git

Merge "Install Collectd on CentOS Build Servers"
---

diff --git a/jjb/armband/armband-rtd-jobs.yaml b/jjb/armband/armband-rtd-jobs.yaml
index be3d8939d..130400899 100644
--- a/jjb/armband/armband-rtd-jobs.yaml
+++ b/jjb/armband/armband-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-armband/47349/'
     rtd-token: 'b8f7de9a1f2baf063ccc6afb52dbc8e6308b6ab5'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'
diff --git a/jjb/fuel/fuel-project-jobs.yaml b/jjb/fuel/fuel-project-jobs.yaml
deleted file mode 100644
index f424c2014..000000000
--- a/jjb/fuel/fuel-project-jobs.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-########################
-# Job configuration for fuel
-########################
-- project:
-    name: fuel-project-jobs
-
-    project: 'fuel'
-
-    installer: 'fuel'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-      - gambia:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
diff --git a/jjb/fuel/fuel-rtd-jobs.yaml b/jjb/fuel/fuel-rtd-jobs.yaml
index b2e8397a2..d40ef984f 100644
--- a/jjb/fuel/fuel-rtd-jobs.yaml
+++ b/jjb/fuel/fuel-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-fuel/47205/'
     rtd-token: '38f40bf6c08fd4bccb930871bc29b08404cf98b0'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'