diff options
| -rw-r--r-- | jjb/global/slave-params.yml | 13 | ||||
| -rw-r--r-- | jjb/opera/opera-daily-jobs.yml | 30 | ||||
| -rw-r--r-- | jjb/releng/testapi-automate.yml | 2 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 2 |
4 files changed, 43 insertions, 4 deletions
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 9d08487a3..d05b7b562 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -439,6 +439,19 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT - parameter: + name: 'huawei-virtual7-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - huawei-virtual7 + default-slaves: + - huawei-virtual7 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT +- parameter: name: 'huawei-pod7-defaults' parameters: - node: diff --git a/jjb/opera/opera-daily-jobs.yml b/jjb/opera/opera-daily-jobs.yml index 76aeb741e..b0755446e 100644 --- a/jjb/opera/opera-daily-jobs.yml +++ b/jjb/opera/opera-daily-jobs.yml @@ -63,7 +63,9 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'huawei-pod7-defaults' + - 'huawei-virtual7-defaults' + - 'compass-defaults' + - 'opera-compass-parameter' builders: - description-setter: @@ -81,7 +83,7 @@ name: deploy condition: SUCCESSFUL projects: - - name: 'opera-daily-deploy-{stream}' + - name: 'compass-deploy-virtual-daily-{stream}' current-parameters: true node-parameters: true kill-phase-on: FAILURE @@ -143,3 +145,27 @@ #!/bin/bash echo "Hello world!" +######################## +# parameter macros +######################## +- parameter: + name: opera-compass-parameter + parameters: + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." + - string: + name: GS_URL + default: '$GS_BASE{gs-pathname}' + description: "URL to Google Storage." + - choice: + name: COMPASS_OPENSTACK_VERSION + choices: + - 'newton' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-openo-noha' + - string: + name: COMPASS_OS_VERSION + default: 'xenial' diff --git a/jjb/releng/testapi-automate.yml b/jjb/releng/testapi-automate.yml index 24e9b8649..abb3481ed 100644 --- a/jjb/releng/testapi-automate.yml +++ b/jjb/releng/testapi-automate.yml @@ -44,7 +44,7 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'utils/**' + pattern: 'utils/test/testapi/**' builders: - run-unit-tests diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index a54750ef7..1da4f3134 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -116,7 +116,7 @@ source $WORKSPACE/yardstick_venv/bin/activate # install python packages - easy_install -U setuptools + 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 . |