diff options
| -rw-r--r-- | jjb/apex/apex.yml | 6 | ||||
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-ci-jobs.yml | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 5 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-lint.yml | 64 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 23 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 47 |
6 files changed, 146 insertions, 2 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index ce60ed3b9..b48e81e8c 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -220,6 +220,12 @@ OPNFV_CLEAN=yes git-revision: false block: true + - trigger-builds: + - project: 'functest-apex-{slave}-suite-{stream1}' + predefined-parameters: | + DEPLOY_SCENARIO=os-nosdn-nofeature-ha + FUNCTEST_SUITE_NAME=vping_userdata + block: true - 'apex-workspace-cleanup' - job-template: diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml index 09b7df172..415cdf380 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml @@ -87,6 +87,9 @@ - '{installer}-defaults' - 'bottlenecks-params-{pod}' - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' + - string: name: GERRIT_REFSPEC_DEBUG default: 'false' description: "Gerrit refspec for debug." diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 57f48109b..af79fbf75 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -67,7 +67,7 @@ - intel-pod8: installer: compass <<: *master - - opnfv-jump-1: + - intel-pod7: installer: apex <<: *master - ericsson-pod1: @@ -172,7 +172,8 @@ - 'promise' - 'doctor' - 'vims' - - 'vping' + - 'vping_userdata' + - 'vping_ssh' - parameter: name: functest-parameter parameters: diff --git a/jjb/opnfv/opnfv-lint.yml b/jjb/opnfv/opnfv-lint.yml new file mode 100644 index 000000000..aeea34e65 --- /dev/null +++ b/jjb/opnfv/opnfv-lint.yml @@ -0,0 +1,64 @@ +######################## +# Job configuration for opnfv-lint +######################## +- project: + + name: opnfv-lint + + project: opnfv-lint + + jobs: + - 'opnfv-lint-verify-{stream}' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + +######################## +# job templates +######################## + +- job-template: + name: 'opnfv-lint-verify-{stream}' + + parameters: + - project-parameter: + project: $GERRIT_PROJECT + - gerrit-parameter: + branch: '{branch}' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + triggers: + - gerrit: + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'REG_EXP' + project-pattern: 'functest' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: '**/*.py' + + builders: + - lint-python-code + - report-lint-result-to-gerrit diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 8ee4b0be6..e7f063c94 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -175,6 +175,29 @@ description: "External network to create for pod6 (name;type;first ip;last ip; gateway;network)" - parameter: + name: 'intel-pod7-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod7 + default-slaves: + - intel-pod7 + - string: + name: INSTALLER_VERSION + default: latest + description: 'Version of the installer to deploy' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' + +- parameter: name: 'intel-pod8-defaults' parameters: - node: diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 8c1539c8b..23d174a26 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -321,6 +321,53 @@ deactivate - builder: + name: lint-python-code + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o pipefail + set -o xtrace + export PATH=$PATH:/usr/local/bin/ + + virtualenv -p python2.7 $WORKSPACE/releng_flake8 + source $WORKSPACE/releng_flake8/bin/activate + + # install python packages + pip install flake8 + + # generate and upload lint log + echo "Running flake8 code on $PROJECT ..." + + echo -e "Flake8 Violations\n-----------------" >> lint.log + find . \ + -path './releng_flake8' -prune -o \ + -type f -name "*.py" -print | \ + xargs flake8 --exit-zero --first >> lint.log + + deactivate + +- builder: + name: report-lint-result-to-gerrit + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o pipefail + set -o xtrace + export PATH=$PATH:/usr/local/bin/ + if [[ -e lint.log ]] ; then + sed -r -i 's/^/ /g' lint.log + echo -e "\nposting linting report to gerrit...\n" + cat lint.log + echo + ssh -p 29418 gerrit.opnfv.org \ + "gerrit review -p $GERRIT_PROJECT \ + -m \"$(cat lint.log)\" \ + $GERRIT_PATCHSET_REVISION" + fi + +- builder: name: upload-review-docs builders: - build-html-and-pdf-docs-output |