diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/opnfv/pod-params.yml | 15 | ||||
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 67 |
2 files changed, 37 insertions, 45 deletions
diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml index bb5e529b7..e36a0b684 100644 --- a/jjb/opnfv/pod-params.yml +++ b/jjb/opnfv/pod-params.yml @@ -102,6 +102,21 @@ description: 'SSH key to use for Apex' - parameter: + name: 'intel-pod3-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod3 + default-slaves: + - intel-pod3 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on the jumphost' + +- parameter: name: 'intel-pod5-defaults' parameters: - node: diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index b4bc70f84..a06507a14 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -1,37 +1,31 @@ - project: + name: vswitchperf + + project: '{name}' + jobs: - - 'vswitchperf-daily-{stream}' - - 'vswitchperf-merge-{stream}' - 'vswitchperf-verify-{stream}' + - 'vswitchperf-merge-{stream}' + - 'vswitchperf-daily-{stream}' - # stream: branch with - in place of / (eg. stable-helium) - # branch: branch (eg. stable/helium) +# only master branch is enabled at the moment to keep no of jobs sane stream: - master: branch: 'master' - - project: 'vswitchperf' - somevar: 'foo' + gs-pathname: '' +# - brahmaputra: +# branch: 'stable/brahmaputra' +# gs-pathname: '/brahmaputra' - job-template: - name: 'vswitchperf-daily-{stream}' - # Job template for daily builders - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - # branch: branch (eg. stable) - - varsetabove: '{somevar}' - node: opnfv-build + name: 'vswitchperf-daily-{stream}' parameters: - project-parameter: project: '{project}' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/vswitchperf + - 'intel-pod3-defaults' scm: - git-scm: @@ -42,9 +36,6 @@ triggers: - timed: 'H H * * *' - prebuilders: - - test-macro - builders: - shell: | pwd @@ -54,16 +45,11 @@ # run basic sanity test make sanity - postbuilders: - - test-macro - - job-template: name: 'vswitchperf-verify-{stream}' project-type: freestyle - node: opnfv-build - concurrent: true properties: @@ -76,10 +62,9 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/vswitchperf + branch: '{branch}' + - 'opnfv-build-defaults' + scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -100,10 +85,10 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: 'vswitchperf' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**' @@ -120,14 +105,8 @@ - job-template: name: 'vswitchperf-merge-{stream}' - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB - project-type: freestyle - node: opnfv-build - concurrent: true properties: @@ -140,10 +119,8 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/vswitchperf + branch: '{branch}' + - 'opnfv-build-defaults' scm: - gerrit-trigger-scm: @@ -159,10 +136,10 @@ comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' - project-pattern: 'vswitchperf' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**' |