Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Correct the description of the bridge used by daisy"
[releng.git]
/
jjb
/
ovsnfv
/
ovsnfv.yml
diff --git
a/jjb/ovsnfv/ovsnfv.yml
b/jjb/ovsnfv/ovsnfv.yml
index
d4b41ee
..
62f6de0
100644
(file)
--- a/
jjb/ovsnfv/ovsnfv.yml
+++ b/
jjb/ovsnfv/ovsnfv.yml
@@
-8,33
+8,37
@@
- 'ovsnfv-merge-{stream}'
- 'ovsnfv-daily-{stream}'
- 'ovsnfv-merge-{stream}'
- 'ovsnfv-daily-{stream}'
-# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
stream:
- master:
- branch: '
master
'
+ branch: '
{stream}
'
gs-pathname: ''
gs-pathname: ''
-# - brahmaputra:
-# branch: 'stable/brahmaputra'
-# gs-pathname: '/brahmaputra'
+ disabled: false
+ - danube:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
- job-template:
name: 'ovsnfv-verify-{stream}'
- job-template:
name: 'ovsnfv-verify-{stream}'
+ disabled: '{obj:disabled}'
+
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
branch: '{branch}'
- - 'intel-us-build-2-defaults'
+ - 'opnfv-build-centos-defaults'
+ - string:
+ name: GS_URL
+ default: '$GS_BASE{gs-pathname}'
+ description: "Directory where the build artifact will be located upon the completion of the build."
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'
@@
-51,36
+55,41
@@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: ANT
+ pattern: 'build/**'
+ - compare-type: ANT
+ pattern: 'ci/**'
builders:
builders:
- - shell: |
- #!/bin/bash
- set -o errexit
- set -o nounset
- set -o pipefail
-
- cd $WORKSPACE/ci
- echo "Builds have been disabled."
-# ./build.sh
+ - build-rpms
- job-template:
name: 'ovsnfv-merge-{stream}'
- job-template:
name: 'ovsnfv-merge-{stream}'
+ disabled: '{obj:disabled}'
+
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
branch: '{branch}'
- - 'intel-us-build-2-defaults'
+ - 'opnfv-build-centos-defaults'
+ - string:
+ name: GS_URL
+ default: '$GS_BASE{gs-pathname}'
+ description: "Directory where the build artifact will be located upon the completion of the build."
scm:
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
+
+ wrappers:
+ - timeout:
+ timeout: 24
+ fail: true
triggers:
- gerrit:
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- change-merged-event
- comment-added-contains-event:
trigger-on:
- change-merged-event
- comment-added-contains-event:
@@
-89,37
+98,53
@@
- project-compare-type: 'ANT'
project-pattern: '{project}'
branches:
- project-compare-type: 'ANT'
project-pattern: '{project}'
branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: ANT
+ pattern: 'build/**'
+ - compare-type: ANT
+ pattern: 'ci/**'
builders:
builders:
- - shell: |
- #!/bin/bash
- set -o errexit
- set -o nounset
- set -o pipefail
-
- cd $WORKSPACE/ci
- echo "Builds have been disabled."
-# ./build.sh
+ - build-rpms
- job-template:
name: 'ovsnfv-daily-{stream}'
- job-template:
name: 'ovsnfv-daily-{stream}'
+ disabled: '{obj:disabled}'
+
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - 'intel-us-build-2-defaults'
+ branch: '{branch}'
+ - 'opnfv-build-centos-defaults'
+ - string:
+ name: GS_URL
+ default: '$GS_BASE{gs-pathname}'
+ description: "Directory where the build artifact will be located upon the completion of the build."
scm:
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
+
+ wrappers:
+ - timeout:
+ timeout: 24
+ fail: true
triggers:
- timed: '@midnight'
triggers:
- timed: '@midnight'
+ builders:
+ - build-rpms
+
+ publishers:
+ - email:
+ recipients: therbert@redhat.com mark.d.gray@intel.com billy.o.mahony@intel.com
+ - email-jenkins-admins-on-failure
+
+- builder:
+ name: build-rpms
builders:
- shell: |
#!/bin/bash
builders:
- shell: |
#!/bin/bash
@@
-128,5
+153,4
@@
set -o pipefail
cd $WORKSPACE/ci
set -o pipefail
cd $WORKSPACE/ci
- echo "Builds have been disabled."
-# ./build.sh
+ ./build.sh