Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[JOID] Update Joid deploy script"
[releng.git]
/
jjb
/
yardstick
/
yardstick-project-jobs.yml
diff --git
a/jjb/yardstick/yardstick-project-jobs.yml
b/jjb/yardstick/yardstick-project-jobs.yml
index
749ebf5
..
64031b7
100644
(file)
--- a/
jjb/yardstick/yardstick-project-jobs.yml
+++ b/
jjb/yardstick/yardstick-project-jobs.yml
@@
-31,7
+31,7
@@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - '
ericsson-build
-defaults'
+ - '
opnfv-build-ubuntu
-defaults'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-59,8
+59,6
@@
branch-pattern: '**/{branch}'
builders:
- yardstick-unit-tests-and-docs-build
branch-pattern: '**/{branch}'
builders:
- yardstick-unit-tests-and-docs-build
- - upload-under-review-docs-to-opnfv-artifacts
- - report-docs-build-result-to-gerrit
- job-template:
name: 'yardstick-merge-{stream}'
- job-template:
name: 'yardstick-merge-{stream}'
@@
-70,7
+68,7
@@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - '
ericsson-build
-defaults'
+ - '
opnfv-build-ubuntu
-defaults'
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
@@
-97,9
+95,6
@@
builders:
- yardstick-unit-tests-and-docs-build
builders:
- yardstick-unit-tests-and-docs-build
- - upload-generated-docs-to-opnfv-artifacts
- - report-docs-build-result-to-gerrit
- - remove-old-docs-from-opnfv-artifacts
################################
# job builders
################################
# job builders
@@
-120,17
+115,11
@@
# install python packages
easy_install -U setuptools
# install python packages
easy_install -U setuptools
- pip install Sphinx==1.3.1 doc8 docutils sphinxcontrib-httpdomain
- python setup.py develop
+ easy_install -U pip
+ pip install -r tests/ci/requirements.txt
+ pip install -e .
# unit tests
./run_tests.sh
# unit tests
./run_tests.sh
- # generate api doc sources
- sphinx-apidoc -o docs/apidocs yardstick
-
- # build docs
- git clone ssh://gerrit.opnfv.org:29418/releng
- GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh
-
deactivate
deactivate