diff options
| -rw-r--r-- | jjb/doctor/doctor.yml | 58 | ||||
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 6 | ||||
| -rwxr-xr-x | utils/test/testapi/install.sh | 14 |
3 files changed, 72 insertions, 6 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 2e26071d7..335eb7133 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -27,6 +27,7 @@ jobs: - 'doctor-verify-{stream}' - 'doctor-verify-{installer}-{inspector}-{stream}' + - 'doctor-profiling-{stream}' - job-template: name: 'doctor-verify-{stream}' @@ -170,3 +171,60 @@ publishers: - archive: artifacts: 'tests/*.log' + +- job-template: + name: 'doctor-profiling-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - 'doctor-default' + - string: + name: PROFILER + default: poc + description: "Profiler to be used" + + scm: + - git-scm-gerrit + + triggers: + - 'doctor-experimental' + +##################################### +# parameter macros +##################################### +# TODO(yujunz) replace common parameter in doctor-verify-{stream} with macro +- parameter: + name: 'doctor-default' + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + +##################################### +# trigger macros +##################################### +- trigger: + name: 'doctor-experimental' + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'check experimental' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: 'ANT' + pattern: 'tests/**' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 0d2c67b3f..fe8ea5381 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -46,7 +46,7 @@ pwd cd src make clobber - make + make MORE_MAKE_FLAGS="-j 10" # run basic sanity test make sanity cd ../ci @@ -107,7 +107,7 @@ pwd cd src make clobber - make + make MORE_MAKE_FLAGS="-j 5" # run basic sanity test make sanity cd ../ci @@ -162,6 +162,6 @@ pwd cd src make clobber - make + make MORE_MAKE_FLAGS="-j 5" cd ../ci ./build-vsperf.sh merge diff --git a/utils/test/testapi/install.sh b/utils/test/testapi/install.sh index 43229eabb..c55691aed 100755 --- a/utils/test/testapi/install.sh +++ b/utils/test/testapi/install.sh @@ -10,9 +10,17 @@ usage: where: -h|--help show this help text" -if [[ $(whoami) != "root" ]]; then - echo "Error: This script must be run as root!" - exit 1 +# Ref :- https://openstack.nimeyo.com/87286/openstack-packaging-all-definition-data-files-config-setup + +if [ -z "$VIRTUAL_ENV" ]; +then + if [[ $(whoami) != "root" ]]; + then + echo "Error: This script must be run as root!" + exit 1 + fi +else + sed -i -e 's#/etc/opnfv_testapi =#etc/opnfv_testapi =#g' setup.cfg fi cp -fr 3rd_party/static opnfv_testapi/tornado_swagger |