Merge "[ipv6] Enable Voting for Documentation Builds"

diff --git a/jjb/armband/armband-rtd-jobs.yaml b/jjb/armband/armband-rtd-jobs.yaml
index be3d893..1304008 100644 (file)
--- 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 59c66a9..2e7689a 100644 (file)
--- 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 (file)
index f424c20..0000000
--- 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 b2e8397..d40ef98 100644 (file)
--- 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/promise/promise-rtd-jobs.yaml b/jjb/promise/promise-rtd-jobs.yaml
index 427e741..a547ac0 100644 (file)
--- a/jjb/promise/promise-rtd-jobs.yaml
+++ b/jjb/promise/promise-rtd-jobs.yaml
@@ -4,7 +4,6 @@
     project: promise
     project-name: promise
 
-    gerrit-skip-vote: true
     project-pattern: 'promise'
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-promise/47386/'
     rtd-token: 'e689330ddc9401d83dd26efbe26a55a6ecd33a0d'

diff --git a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml
index ff6814c..0b4b1b1 100644 (file)
--- 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 7a2c1d1..50839be 100644 (file)
--- 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: