From: Aric Gardner <agardner@linuxfoundation.org>
Date: Thu, 8 Nov 2018 19:29:55 +0000 (+0000)
Subject: Merge "[dovetail] remove the stream check for fuel"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=aef935b21dbe400ba9fc814f9aded18155a216f0;hp=a1df36b25e09807d3249c951703a391ee0e1cc51;p=releng.git

Merge "[dovetail] remove the stream check for fuel"
---

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/daisy4nfv/daisy-rtd-jobs.yaml b/jjb/daisy4nfv/daisy-rtd-jobs.yaml
index 59c66a952..2e7689a68 100644
--- a/jjb/daisy4nfv/daisy-rtd-jobs.yaml
+++ b/jjb/daisy4nfv/daisy-rtd-jobs.yaml
@@ -4,7 +4,6 @@
     project: daisy
     project-name: daisy
 
-    gerrit-skip-vote: true
     project-pattern: 'daisy'
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-daisy/47361/'
     rtd-token: '265efe14ff0bb3fa0d4ea66d6be1b7b511d5d713'
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'
diff --git a/jjb/ipv6/ipv6-rtd-jobs.yaml b/jjb/ipv6/ipv6-rtd-jobs.yaml
index 7a677cee9..dde8e7d20 100644
--- a/jjb/ipv6/ipv6-rtd-jobs.yaml
+++ b/jjb/ipv6/ipv6-rtd-jobs.yaml
@@ -4,7 +4,6 @@
     project: ipv6
     project-name: ipv6
 
-    gerrit-skip-vote: true
     project-pattern: 'ipv6'
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ipv6/47370/'
     rtd-token: 'e7abb4e2c3f3f0dfc1a8feefe39b27f4a4f9b98a'
diff --git a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml
index ff6814cb6..0b4b1b130 100644
--- a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml
+++ b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml
@@ -4,7 +4,6 @@
     project: stor4nfv
     project-name: stor4nfv
 
-    gerrit-skip-vote: true
     project-pattern: 'stor4nfv'
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-stor4nfv/47394/'
     rtd-token: '9c189b44cf08de75dc06253558cc86ed93982cbb'
diff --git a/utils/build-server-ansible/vars/CentOS.yml b/utils/build-server-ansible/vars/CentOS.yml
index 7a2c1d1d5..50839be70 100644
--- a/utils/build-server-ansible/vars/CentOS.yml
+++ b/utils/build-server-ansible/vars/CentOS.yml
@@ -29,24 +29,25 @@
     name: "{{ item }}"
     state: present
   with_items:
-    - python-pip
-    - rpm-build
+    - bc
+    - collectd
+    - doxygen
+    - facter
+    - jq
     - kernel-headers
     - libpcap-devel
-    - zlib-devel
-    - numactl-devel
-    - doxygen
-    - python-sphinx
     - libvirt-devel
-    - python-devel
+    - net-tools
+    - numactl-devel
     - openssl-devel
+    - python-devel
+    - python-pip
     - python-six
-    - net-tools
-    - bc
+    - python-sphinx
+    - rpm-build
     - sysstat
     - xmlstarlet
-    - facter
-    - jq
+    - zlib-devel
 
 - name: install the 'Development tools' package group
   yum: