Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
improve: discard venv support for official product
[releng.git]
/
jjb
/
vswitchperf
/
vswitchperf.yml
diff --git
a/jjb/vswitchperf/vswitchperf.yml
b/jjb/vswitchperf/vswitchperf.yml
index
a7b78d1
..
c5c81c8
100644
(file)
--- a/
jjb/vswitchperf/vswitchperf.yml
+++ b/
jjb/vswitchperf/vswitchperf.yml
@@
-1,105
+1,86
@@
- project:
- project:
+
name: vswitchperf
name: vswitchperf
+
+ project: '{name}'
+
jobs:
jobs:
- - 'vswitchperf-daily-{stream}'
- - 'vswitchperf-merge-{stream}'
- 'vswitchperf-verify-{stream}'
- 'vswitchperf-verify-{stream}'
+ - 'vswitchperf-merge-{stream}'
+ - 'vswitchperf-daily-{stream}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
stream:
- master:
stream:
- master:
- branch: 'master'
-
- project: 'vswitchperf'
- somevar: 'foo'
+ branch: '{stream}'
+ gs-pathname: ''
+ disabled: false
+ slave-label: 'opnfv-build-ubuntu'
+ - danube:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+ slave-label: 'opnfv-build-ubuntu'
- job-template:
- 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}'
- logrotate:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ disabled: '{obj:disabled}'
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/vswitchperf
+ branch: '{branch}'
+ - 'intel-pod12-defaults'
scm:
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
triggers:
triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
+ - pollscm:
+ cron: '@midnight'
builders:
- shell: |
pwd
cd src
make clobber
builders:
- shell: |
pwd
cd src
make clobber
- make
+ make
MORE_MAKE_FLAGS="-j 10"
# run basic sanity test
make sanity
# run basic sanity test
make sanity
-
- postbuilders:
- - test-macro
+ cd ../ci
+ scl enable python33 "source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily"
- job-template:
name: 'vswitchperf-verify-{stream}'
- job-template:
name: 'vswitchperf-verify-{stream}'
- project-type: freestyle
+ disabled: '{obj:disabled}'
- node: opnfv-build
+ project-type: freestyle
concurrent: true
properties:
concurrent: true
properties:
- - throttle:
- enabled: true
- max-total: 3
- max-per-node: 2
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: -1
+ - logrotate-default
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'vswitchperf-verify-.*'
+ - 'vswitchperf-merge-.*'
+ block-level: 'NODE'
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
- branch: 'master'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/vswitchperf
+ branch: '{branch}'
+ - '{slave-label}-defaults'
+
scm:
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
@@
-112,10
+93,11
@@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: '
vswitchperf
'
+ project-pattern: '
{project}
'
branches:
- branch-compare-type: 'ANT'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
+ disable-strict-forbidden-file-verification: 'true'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**'
@@
-125,62
+107,53
@@
pwd
cd src
make clobber
pwd
cd src
make clobber
- make
+ make
MORE_MAKE_FLAGS="-j 5"
# run basic sanity test
make sanity
# run basic sanity test
make sanity
+ cd ../ci
+ ./build-vsperf.sh verify
- job-template:
name: 'vswitchperf-merge-{stream}'
- job-template:
name: 'vswitchperf-merge-{stream}'
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
+ disabled: '{obj:disabled}'
project-type: freestyle
project-type: freestyle
- node: opnfv-build
-
concurrent: true
properties:
concurrent: true
properties:
- - throttle:
- enabled: true
- max-total: 3
- max-per-node: 2
-
- logrotate:
- daysToKeep: 30
- numToKeep: 40
- artifactDaysToKeep: -1
- artifactNumToKeep: 5
+ - logrotate-default
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'vswitchperf-verify-.*'
+ - 'vswitchperf-merge-.*'
+ block-level: 'NODE'
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
- branch: 'master'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/vswitchperf
+ branch: '{branch}'
+ - '{slave-label}-defaults'
scm:
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit:
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- change-merged-event
- comment-added-contains-event:
comment-contains-value: 'remerge'
projects:
- project-compare-type: 'ANT'
trigger-on:
- change-merged-event
- comment-added-contains-event:
comment-contains-value: 'remerge'
projects:
- project-compare-type: 'ANT'
- project-pattern: '
vswitchperf
'
+ project-pattern: '
{project}
'
branches:
- branch-compare-type: 'ANT'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
+ disable-strict-forbidden-file-verification: 'true'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**'
@@
-190,4
+163,6
@@
pwd
cd src
make clobber
pwd
cd src
make clobber
- make
+ make MORE_MAKE_FLAGS="-j 5"
+ cd ../ci
+ ./build-vsperf.sh merge