Merge "Adjust CSIT for UM projects"

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 903332e806d38e6ae811dab4678b686e120b561c..f49b3b3e91ee9a2166914371156bdf4a4ef56736 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -56,10 +56,9 @@
           virtualenv --system-site-packages $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           PYTHON="$WORKSPACE/venv/bin/python"
-          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip install --upgrade "pip<10.0.0" setuptools
           $PYTHON -m pip install --upgrade networkx
-          $PYTHON -m pip install --upgrade pipdeptree
-          pipdeptree
+          $PYTHON -m pip freeze
           ./scripts/determine-merge-order.py
           deactivate
           rm -rf $WORKSPACE/venv

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index d6166317185565ca8973d0b7d8da36bfb99b7085..5e4639a097dcaa1a2f6a0104bed5684a5ed8b0be 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -19,4 +19,5 @@
     project-name: docs
     build-node: centos7-builder-4c-4g
     build-timeout: 60
-    rtd-project: opendaylight
+    rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight/32322/
+    rtd-token: 86e54dd38c651e2164ea63c183ae601d19cd1f3c

diff --git a/jjb/generate-csit-status-report.sh b/jjb/generate-csit-status-report.sh
index 02cdf5b9c72021491ced30f2b357a9ab07413a81..83d5c9ea3abeed217274ed313d4ee34d1c66207b 100644 (file)
--- a/jjb/generate-csit-status-report.sh
+++ b/jjb/generate-csit-status-report.sh
@@ -57,7 +57,7 @@ EOF
 virtualenv --quiet "/tmp/v/jenkins"
 # shellcheck source=/tmp/v/jenkins/bin/activate disable=SC1091
 source "/tmp/v/jenkins/bin/activate"
-pip install --quiet --upgrade pip
+pip install --quiet --upgrade "pip<10.0.0" setuptools
 pip install --quiet --upgrade tox beautifulsoup4 requests
 
 echo python "$script" "$BUILD_URL"

diff --git a/jjb/global-jjb b/jjb/global-jjb
index edf56a1e9ce91d936388621ecfc850162aabfebd..9f237eb9ddb18fe6e01cbadea0a75e36a0baf8d7 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit edf56a1e9ce91d936388621ecfc850162aabfebd
+Subproject commit 9f237eb9ddb18fe6e01cbadea0a75e36a0baf8d7

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index f28dca1d711552502a30ee724b4c73dff22fd7c1..cf298ca5ae6ed7456cba141ec85f9ad892681dff 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -15,7 +15,8 @@
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: integration/test
-          rtd-project: odl-integrationtest
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-integrationtest/32934/
+          rtd-token: 70766f97941a74ef80b84749ac4799e5ddeee99a
       - gerrit-tox-verify:
           branch: master
           stream: master

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 3d83608ced9741817c398c4540afec9d483e5009..d373f1327717672927247b617c168cf85b1839c4 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -52,7 +52,8 @@
     project: releng/docs
     project-pattern: releng/docs
     build-node: centos7-builder-2c-1g
-    rtd-project: lf-releng-docs
+    rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-docs/32930/
+    rtd-token: e02d61c268c3cc11b65ef169ff199dbb82989647
     stream: any
     branch: '*'
 
@@ -69,7 +70,8 @@
     project: releng/docs-conf
     project-pattern: releng/docs-conf
     build-node: centos7-builder-2c-1g
-    rtd-project: lfdocs-conf
+    rtd-build-url: https://readthedocs.org/api/v2/webhook/lfdocs-conf/32931/
+    rtd-token: 27a59073490f2cefab41761dc225ac8c8bfdf028
     stream: any
     branch: '*'
 
@@ -86,7 +88,8 @@
     project: releng/global-jjb
     project-pattern: releng/global-jjb
     build-node: centos7-builder-2c-8g
-    rtd-project: lf-releng-global-jjb
+    rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-global-jjb/32932/
+    rtd-token: f19058af6f90e04dff828e3eec5e2f0990895a7b
     stream: any
     branch: '*'
 
@@ -119,7 +122,8 @@
     project: releng/lftools
     project-pattern: releng/lftools
     build-node: centos7-builder-2c-8g
-    rtd-project: lf-releng-tools
+    rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-tools/32933/
+    rtd-token: 47a135ceba9053c6f88394a7171ebf5602a9fc95
     stream: any
     branch: '*'
 

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 50b654e6ffb97995b9592d672e44117bcdaf76ae..8a00e9b51ce6b8fc70c17bc2c57f17689cb82381 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -8,7 +8,8 @@
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: netvirt
-          rtd-project: odl-netvirt
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
+          rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
       - gerrit-tox-verify
       - odl-maven-jobs
 

diff --git a/jjb/odl-openstack-install.sh b/jjb/odl-openstack-install.sh
index adf7d923a41c68a7fa4a9da77c44eeb51ae4a53c..0fb1b199e1e9930c7de41c5ade3f91069e67577c 100644 (file)
--- a/jjb/odl-openstack-install.sh
+++ b/jjb/odl-openstack-install.sh
@@ -14,7 +14,6 @@ echo "---> Install openstack cli into /tmp/v/openstack"
 virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
-pip install --upgrade pip
+pip install --upgrade "pip<10.0.0" setuptools
 pip install --upgrade python-openstackclient python-heatclient
-pip install --upgrade pipdeptree
-pipdeptree
+pip freeze

diff --git a/jjb/opendaylight-infra-push-gerrit-patch.sh b/jjb/opendaylight-infra-push-gerrit-patch.sh
index 0d1a67055ae7f97722ea7ed55cfc986b80e5fc0e..f64da9cbcab18dac4980abb2a7dfd424d27392d7 100644 (file)
--- a/jjb/opendaylight-infra-push-gerrit-patch.sh
+++ b/jjb/opendaylight-infra-push-gerrit-patch.sh
@@ -15,10 +15,9 @@
 virtualenv "/tmp/v/git-review"
 # shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091
 source "/tmp/v/git-review/bin/activate"
-pip install --upgrade pip
+pip install --upgrade "pip<10.0.0" setuptools
 pip install --upgrade git-review
-pip install --upgrade pipdeptree
-pipdeptree
+pip freeze
 
 # shellcheck disable=SC1083
 CHANGE_ID=$(ssh -p 29418 "jenkins-$SILO@git.opendaylight.org" gerrit query \

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index b3afb0481f55f737e338a0c78e8dba94b989a7c9..381f9bec3f6a981992609e3d8d8f9359290a72b9 100644 (file)
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -12,10 +12,9 @@
 virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
-pip install --upgrade pip
+pip install --upgrade "pip<10.0.0" setuptools
 pip install --upgrade python-openstackclient python-heatclient
-pip install --upgrade pipdeptree
-pipdeptree
+pip freeze
 
 cd /builder/openstack-hot || exit 1
 

diff --git a/jjb/opendaylight-infra-update-image-list.sh b/jjb/opendaylight-infra-update-image-list.sh
index 20ceb396e55727f1e7ed0ccf1d6bffaae677659d..a6c61b25101394cdc99817dba28a3e264f62e054 100644 (file)
--- a/jjb/opendaylight-infra-update-image-list.sh
+++ b/jjb/opendaylight-infra-update-image-list.sh
@@ -12,10 +12,9 @@
 virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
-pip install --upgrade --quiet pip
+pip install --upgrade --quiet "pip<10.0.0" setuptools
 pip install --upgrade --quiet python-openstackclient python-heatclient
-pip install --upgrade pipdeptree
-pipdeptree
+pip freeze
 
 cat > "$WORKSPACE/docs/cloud-images.rst" << EOF
 Following are the list of published images available to be used with Jenkins jobs.

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index bb7add2fbb79eb9afc3ad59acbe7c87958aced6f..3755c7c51e9e6e199612151b005f00e02aa3e84e 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -8,7 +8,8 @@
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: integration/packaging
-          rtd-project: odl-integrationpackaging
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-integrationpackaging/32928/
+          rtd-token: 371d63c43ad99b0745bb7779e3488c5e255c1180
       - 'packaging-build-rpm-{stream}'
       - 'packaging-build-rpm-{distro}-snap-{stream}'
       - 'packaging-build-deb-{stream}'

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index f0af74ad67c545724b24a7a488a95551ed1aebf3..0dd4d44aaf6a948c43f954617ae8a301e23dc3aa 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -4,7 +4,8 @@
     jobs:
       - '{project-name}-rtd-jobs':
           project-pattern: releng/builder
-          rtd-project: opendaylight-releng-builder
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-releng-builder/32926/
+          rtd-token: e9fa62bd60a39c22de631791309ccacc37a9929e
       - gerrit-jenkins-cfg-merge:
           jenkins-silos: releng sandbox
       - gerrit-jjb-deploy-job

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index 2b0ebb67131e0b056460f45dde947566184d4f80..7408508187fb0522747412177a9c8a22a53606a5 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -6,6 +6,8 @@
       - '{project-name}-python-jobs'
       - '{project-name}-rtd-jobs':
           project-pattern: spectrometer
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-spectrometer/32925/
+          rtd-token: 383146c345ca41b9e36859b6dcd57ffca38f21c7
       - spectrometer-deploy-webapp-master
 
     stream:
@@ -14,7 +16,6 @@
 
     project: spectrometer
     project-name: spectrometer
-    rtd-project: opendaylight-spectrometer
     tox-dir: server
     node-dir: web
     node-version: 6.11.4