From: Jamo Luhrsen Date: Mon, 16 Apr 2018 22:43:28 +0000 (+0000) Subject: Merge "Adjust CSIT for UM projects" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=dd127697545ae248565a4fb8b0468691bed3d522;hp=9787e9c2088874c66836d31c3f6854c975fd9653;p=releng%2Fbuilder.git Merge "Adjust CSIT for UM projects" --- diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 903332e80..f49b3b3e9 100644 --- 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 d61663171..5e4639a09 100644 --- 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 02cdf5b9c..83d5c9ea3 100644 --- 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 edf56a1e9..9f237eb9d 160000 --- 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 f28dca1d7..cf298ca5a 100644 --- 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 3d83608ce..d373f1327 100644 --- 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 50b654e6f..8a00e9b51 100644 --- 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 adf7d923a..0fb1b199e 100644 --- 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 0d1a67055..f64da9cbc 100644 --- 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 b3afb0481..381f9bec3 100644 --- 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 20ceb396e..a6c61b251 100644 --- 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 bb7add2fb..3755c7c51 100644 --- 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 f0af74ad6..0dd4d44aa 100644 --- 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 2b0ebb671..740850818 100644 --- 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