Merge "Move Barometer Builds to lf-build2"

diff --git a/jjb/apex/apex-rtd-jobs.yaml b/jjb/apex/apex-rtd-jobs.yaml
index 16ae7d9..48e4949 100644 (file)
--- a/jjb/apex/apex-rtd-jobs.yaml
+++ b/jjb/apex/apex-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-apex/47262/'
     rtd-token: '134db049c774ab06c41db432e3a042a982f50edf'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

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/auto/auto-rtd-jobs.yaml b/jjb/auto/auto-rtd-jobs.yaml
index 1eca3af..f23fe95 100644 (file)
--- a/jjb/auto/auto-rtd-jobs.yaml
+++ b/jjb/auto/auto-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-auto/47350/'
     rtd-token: '3c2277762678c97e59d24c83201194d6b56d7983'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/availability/availability-rtd-jobs.yaml b/jjb/availability/availability-rtd-jobs.yaml
index d63bb9e..e245e59 100644 (file)
--- a/jjb/availability/availability-rtd-jobs.yaml
+++ b/jjb/availability/availability-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-availability/47351/'
     rtd-token: '3ae514b14073e1eacb697d3eddee62a26c8c891c'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/barometer/barometer-rtd-jobs.yaml b/jjb/barometer/barometer-rtd-jobs.yaml
index 1b647db..936d1f2 100644 (file)
--- a/jjb/barometer/barometer-rtd-jobs.yaml
+++ b/jjb/barometer/barometer-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-barometer/47353/'
     rtd-token: 'aef70b8a0148b295e25dd92474110bcd622bacb0'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml
index 27b883b..9730f24 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml
+++ b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-bottlenecks/47355/'
     rtd-token: '95dd0dbdde4a219b5196ffb86e15401b7b927885'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml
index 974ec6e..7d13688 100644 (file)
--- a/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml
+++ b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-compass4nfv/47358/'
     rtd-token: '4208e8492be2e4eab7f18f1e70b5d78247d1b249'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/container4nfv/container4nfv-rtd-jobs.yaml b/jjb/container4nfv/container4nfv-rtd-jobs.yaml
index 0a008b4..b55f958 100644 (file)
--- a/jjb/container4nfv/container4nfv-rtd-jobs.yaml
+++ b/jjb/container4nfv/container4nfv-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-container4nfv/47359/'
     rtd-token: '82f917a788d006dc15df14ecd3c991115490bf8a'
 
+    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/doctor/doctor-rtd-jobs.yaml b/jjb/doctor/doctor-rtd-jobs.yaml
index 1693a6f..13ff860 100644 (file)
--- a/jjb/doctor/doctor-rtd-jobs.yaml
+++ b/jjb/doctor/doctor-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-doctor/47362/'
     rtd-token: 'bf8640556a3ba3151e4e5602facc5ed982dd88c8'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/edgecloud/edgecloud-rtd-jobs.yaml b/jjb/edgecloud/edgecloud-rtd-jobs.yaml
new file mode 100644 (file)
index 0000000..a3835f3
--- /dev/null
+++ b/jjb/edgecloud/edgecloud-rtd-jobs.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+    name: edgecloud-rtd
+    project: edgecloud
+    project-name: edgecloud
+
+    project-pattern: 'edgecloud'
+    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-edgecloud/52895/'
+    rtd-token: '47989bec8e8da44ab2f33491cd6031f0411d319b'
+
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
+    jobs:
+      - '{project-name}-rtd-jobs'

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 7d90b06..fb619c3 100644 (file)
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -206,7 +206,7 @@
       # 1.here the stream means the SUT stream, dovetail stream is defined in its own job
       # 2.testsuite default here is for the test cases already added into OVP
       # 3.run default testsuite mandatory test cases against ha scenario
-      # 4.run default testsuite optional test cases against ha scenario
+      # 4.run default testsuite optional test cases against ha scenario twice one week
       # 5.not used for release criteria or compliance, only to debug the dovetail tool bugs
       - conditional-step:
           condition-kind: and
@@ -214,9 +214,6 @@
             - condition-kind: regex-match
               regex: '.*-ha'
               label: '{scenario}'
-            - condition-kind: regex-match
-              regex: 'fraser'
-              label: '{stream}'
           steps:
             - trigger-builds:
                 - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}'
@@ -235,9 +232,12 @@
             - condition-kind: regex-match
               regex: '.*-ha'
               label: '{scenario}'
-            - condition-kind: regex-match
-              regex: 'fraser'
-              label: '{stream}'
+            - condition-kind: day-of-week
+              day-selector: select-days
+              days:
+                MON: true
+                WED: true
+              use-build-time: true
           steps:
             - trigger-builds:
                 - project: 'dovetail-fuel-{pod}-default-optional-{stream}'

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/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml
index e453382..785bd35 100644 (file)
--- a/jjb/functest/functest-rtd-jobs.yaml
+++ b/jjb/functest/functest-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-functest/47369/'
     rtd-token: '26f9131bd5c337928ba8b431a289f6850b330504'
 
+    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 7a677ce..edaa1c3 100644 (file)
--- a/jjb/ipv6/ipv6-rtd-jobs.yaml
+++ b/jjb/ipv6/ipv6-rtd-jobs.yaml
@@ -4,10 +4,17 @@
     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'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml
index 3169f33..984ec4f 100644 (file)
--- a/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml
+++ b/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ovn4nfv/47381/'
     rtd-token: 'f131200fd878a5c443f18c134c3bfda122538bce'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml b/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml
index f5cc819..a01544f 100644 (file)
--- a/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml
+++ b/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-sdnvpn/47391/'
     rtd-token: '1efdc48a9819be55a28137937674f1f744d02fe0'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/sfc/sfc-rtd-jobs.yaml b/jjb/sfc/sfc-rtd-jobs.yaml
index 42b2004..f7d4c9b 100644 (file)
--- a/jjb/sfc/sfc-rtd-jobs.yaml
+++ b/jjb/sfc/sfc-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-sfc/47392/'
     rtd-token: 'bc4419f4dded5c816071b042ac32c03ac6108700'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml
index ff6814c..0e03e7b 100644 (file)
--- a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml
+++ b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml
@@ -4,10 +4,17 @@
     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'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml b/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml
index 01b8cdf..9981240 100644 (file)
--- a/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml
+++ b/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-vswitchperf/47398/'
     rtd-token: '47bbe5675e6cc5a6207fcc9b4db8dac03c27d9de'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/yardstick/yardstick-rtd-jobs.yaml b/jjb/yardstick/yardstick-rtd-jobs.yaml
index 88574f0..a18a655 100644 (file)
--- a/jjb/yardstick/yardstick-rtd-jobs.yaml
+++ b/jjb/yardstick/yardstick-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-yardstick/47399/'
     rtd-token: '6aa883824f3917c7db5ffa1fe9168817fb5feb68'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

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: