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 "bifrost: Use 'unsafe' disk cache for test VMs"
[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
afa6b78
..
f328164
100644
(file)
--- a/
jjb/yardstick/yardstick-project-jobs.yml
+++ b/
jjb/yardstick/yardstick-project-jobs.yml
@@
-16,7
+16,7
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
- -
colorado
:
+ -
danube
:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
@@
-38,10
+38,7
@@
- 'opnfv-build-ubuntu-defaults'
scm:
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
triggers:
- gerrit:
@@
-82,10
+79,7
@@
description: "Directory where the build artifact will be located upon the completion of the build."
scm:
description: "Directory where the build artifact will be located upon the completion of the build."
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit:
triggers:
- gerrit:
@@
-122,7
+116,8
@@
source $WORKSPACE/yardstick_venv/bin/activate
# install python packages
source $WORKSPACE/yardstick_venv/bin/activate
# install python packages
- easy_install -U setuptools
+ sudo apt-get install -y build-essential python-dev python-pip python-pkg-resources
+ easy_install -U setuptools==33.1.1
easy_install -U pip
pip install -r requirements.txt || pip install -r tests/ci/requirements.txt
pip install -e .
easy_install -U pip
pip install -r requirements.txt || pip install -r tests/ci/requirements.txt
pip install -e .