diff options
| -rw-r--r-- | jjb/fastpathmetrics/fastpathmetrics.yml | 105 | ||||
| -rw-r--r-- | jjb/parser/parser.yml | 10 |
2 files changed, 108 insertions, 7 deletions
diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index 5b2c9c2cf..c9699ad23 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -9,6 +9,8 @@ jobs: - 'fastpathmetrics-verify-{stream}' + - 'fastpathmetrics-merge-{stream}' + - 'fastpathmetrics-daily-{stream}' stream: - master: @@ -58,4 +60,105 @@ builders: - shell: | - echo "Nothing to verify!" + pwd + cd src + make clobber + make + +- job-template: + name: 'fastpathmetrics-merge-{stream}' + + project-type: freestyle + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 3 + max-per-node: 2 + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'opnfv-build-defaults' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + choosing-strategy: 'default' + + triggers: + - gerrit: + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' + + builders: + - shell: | + pwd + cd src + make clobber + make + +- job-template: + name: 'fastpathmetrics-daily-{stream}' + + project-type: freestyle + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 3 + max-per-node: 2 + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'opnfv-build-defaults' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + choosing-strategy: 'default' + + triggers: + - gerrit: + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' + + builders: + - shell: | + pwd + cd src + make clobber + make diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index 2ab1af833..01f51aa68 100644 --- a/jjb/parser/parser.yml +++ b/jjb/parser/parser.yml @@ -58,15 +58,13 @@ builders: - shell: | - #/bin/bash + #!/bin/bash set -o errexit set -o pipefail set -o xtrace export PATH=$PATH:/usr/local/bin/ - + # pep8 check parser/tosca2heat/tosca-parser echo "Running tox -e pep8 on tosca2heat ..." - cd $WORKSPACE/parser/tosca2heat/tosca-parser - tox -e pep8 - cd $WORKSPACE/parser/tosca2heat/heat-translator - tox -e pep8 + cd $WORKSPACE/tosca2heat/tosca-parser && tox -e pep8 + cd $WORKSPACE/tosca2heat/heat-translator && tox -e pep8 |