Merge "Add aaa docs jobs"

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index fb8ebd152d58eb07a250289e2d165fb48b23f2bf..2018d4e0752927dee689aad7419b2be443280ae4 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -4,6 +4,11 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: bgpcep
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
+          rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
       - odl-maven-jobs
 
     stream: neon
@@ -30,6 +35,11 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: bgpcep
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
+          rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 027cadcd84bb15d007ef3cd439a402947e0af6c6..9852536a235b52a198035ea3c0dc4ef527ad7b77 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -3,6 +3,11 @@
     name: daexim-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: daexim
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
+          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
       - odl-maven-jobs
 
     project: 'daexim'
@@ -21,6 +26,11 @@
     name: daexim-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: daexim
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
+          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
       - odl-maven-jobs
 
     project: 'daexim'

diff --git a/jjb/integration/csit-jobs-neon.lst b/jjb/integration/csit-jobs-neon.lst
index 93c0fdbad66261d8a43cff3ea73b620ce9544f86..2de629eaa7e3cc70d9949fc3e1aad006fdbafe53 100644 (file)
--- a/jjb/integration/csit-jobs-neon.lst
+++ b/jjb/integration/csit-jobs-neon.lst
@@ -30,6 +30,7 @@ netconf-csit-1node-userfeatures-all-neon,
 netconf-csit-3node-cluster-stress-all-neon,
 netconf-csit-3node-clustering-all-neon,
 netconf-csit-3node-clustering-scale-all-neon,
+netvirt-csit-1node-0cmb-1ctl-1cmp-openstack-queens-sfc-neon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-neon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-neon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-snat-conntrack-neon,

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index f7f985e6162d7d121799f0ec0c73959671ca3eec..6910317ec056ca71bc9443744abd94b335c79ae8 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -2,6 +2,11 @@
 - project:
     name: sxp-neon
     jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: sxp
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
+          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
 
     stream: neon
@@ -19,6 +24,11 @@
 - project:
     name: sxp-fluorine
     jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: sxp
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
+          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 1958b42e7ffbb84974eda4c7d6adc59bb610b298..9221d23bebe84e310aa25f56a2672ef9fbefb6ca 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -2,6 +2,11 @@
 - project:
     name: tsdr-neon
     jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: tsdr
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
+          rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
       - odl-maven-jobs
 
     stream: neon
@@ -19,6 +24,11 @@
 - project:
     name: tsdr-fluorine
     jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: tsdr
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
+          rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/packer/provision/devstack-pre-pip.sh b/packer/provision/devstack-pre-pip.sh
index 66c398b3e7483c213710b055b2d44843d8888c39..8a910d972d4407f38cc2b5add60c2fcea2d5abb2 100644 (file)
--- a/packer/provision/devstack-pre-pip.sh
+++ b/packer/provision/devstack-pre-pip.sh
@@ -4,7 +4,7 @@
 set -xeu -o pipefail
 
 # Install xpath
-yum install -y perl-XML-XPath python-pip python-six
+yum install -y perl-XML-XPath python-pip
 
 # install crudini command line tool for editing config files
 yum install -y crudini

diff --git a/packer/provision/devstack.sh b/packer/provision/devstack.sh
index 63fdea7d67b0e978c7e4a7104ee5df87556a7195..a420da9dcbbb2c7608027984a5c9b4101baf631c 100644 (file)
--- a/packer/provision/devstack.sh
+++ b/packer/provision/devstack.sh
@@ -4,7 +4,7 @@
 set -xeu -o pipefail
 
 # Install xpath
-yum install -y perl-XML-XPath python-pip python-six
+yum install -y perl-XML-XPath python-pip
 
 # install crudini command line tool for editing config files
 yum install -y crudini