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 "jjb: infra: bifrost-verify-jobs: Ignore jjb patchsets"
[releng.git]
/
jjb
/
infra
/
bifrost-verify-jobs.yml
diff --git
a/jjb/infra/bifrost-verify-jobs.yml
b/jjb/infra/bifrost-verify-jobs.yml
index
d15bf74
..
4c106fc
100644
(file)
--- a/
jjb/infra/bifrost-verify-jobs.yml
+++ b/
jjb/infra/bifrost-verify-jobs.yml
@@
-24,17
+24,20
@@
disabled: false
dib-os-release: 'trusty'
dib-os-element: 'ubuntu-minimal'
disabled: false
dib-os-release: 'trusty'
dib-os-element: 'ubuntu-minimal'
- dib-os-packages: 'openssh-server,vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
+ dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
+ extra-dib-elements: 'openssh-server'
- 'centos7':
disabled: false
dib-os-release: '7'
- 'centos7':
disabled: false
dib-os-release: '7'
- dib-os-element: 'centos-minimal'
- dib-os-packages: 'openssh-server,vim,less,bridge-utils,iputils,rsyslog,curl'
+ dib-os-element: 'centos7'
+ dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+ extra-dib-elements: 'openssh-server'
- 'suse':
- 'suse':
- disabled: true
- dib-os-release: 'suse'
- dib-os-element: 'suse'
- dib-os-packages: ''
+ disabled: false
+ dib-os-release: '42.2'
+ dib-os-element: 'opensuse-minimal'
+ dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+ extra-dib-elements: 'openssh-server'
#--------------------------------
# type
#--------------------------------
#--------------------------------
# type
#--------------------------------
@@
-45,6
+48,16
@@
#--------------------------------
jobs:
- '{project}-bifrost-verify-{distro}-{type}-{stream}'
#--------------------------------
jobs:
- '{project}-bifrost-verify-{distro}-{type}-{stream}'
+
+#--------------------------------
+# VM defaults
+#--------------------------------
+- defaults:
+ name: vm_defaults
+ vm-disk: '30'
+ vm-memory: '4096'
+ vm-cpu: '2'
+
#--------------------------------
# job templates
#--------------------------------
#--------------------------------
# job templates
#--------------------------------
@@
-53,9
+66,12
@@
disabled: '{obj:disabled}'
disabled: '{obj:disabled}'
+ defaults: vm_defaults
+
concurrent: false
properties:
concurrent: false
properties:
+ - logrotate-default
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
@@
-81,15
+97,30
@@
- string:
name: DIB_OS_ELEMENT
default: '{dib-os-element}'
- string:
name: DIB_OS_ELEMENT
default: '{dib-os-element}'
+ - string:
+ name: EXTRA_DIB_ELEMENTS
+ default: '{extra-dib-elements}'
- string:
name: DIB_OS_PACKAGES
default: '{dib-os-packages}'
- string:
name: DIB_OS_PACKAGES
default: '{dib-os-packages}'
+ - string:
+ name: VM_DISK
+ default: '{vm-disk}'
+ - string:
+ name: VM_MEMORY
+ default: '{vm-memory}'
+ - string:
+ name: VM_CPU
+ default: '{vm-cpu}'
- string:
name: CLEAN_DIB_IMAGES
default: 'true'
- label:
name: SLAVE_LABEL
default: 'infra-{type}-{distro}'
- string:
name: CLEAN_DIB_IMAGES
default: 'true'
- label:
name: SLAVE_LABEL
default: 'infra-{type}-{distro}'
+ - string:
+ name: BIFROST_LOG_URL
+ default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME'
scm:
- git:
scm:
- git:
@@
-107,10
+138,8
@@
branch: '{branch}'
builders:
branch: '{branch}'
builders:
- - description-setter:
- description: "Built on $NODE_NAME"
- - shell:
- !include-raw-escape: ./bifrost-verify.sh
+ - bifrost-set-name
+ - bifrost-build
publishers:
- email:
publishers:
- email:
@@
-131,7
+160,7
@@
exclude-no-code-change: 'false'
- comment-added-contains-event:
comment-contains-value: 'recheck'
exclude-no-code-change: 'false'
- comment-added-contains-event:
comment-contains-value: 'recheck'
- custom-url: '* $JOB_NAME $B
UILD_URL
'
+ custom-url: '* $JOB_NAME $B
IFROST_LOG_URL/index.html
'
silent-start: true
projects:
- project-compare-type: 'PLAIN'
silent-start: true
projects:
- project-compare-type: 'PLAIN'
@@
-160,6
+189,7
@@
comment-contains-value: 'recheck'
- comment-added-contains-event:
comment-contains-value: 'reverify'
comment-contains-value: 'recheck'
- comment-added-contains-event:
comment-contains-value: 'reverify'
+ custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
projects:
- project-compare-type: 'ANT'
project-pattern: 'releng'
projects:
- project-compare-type: 'ANT'
project-pattern: 'releng'
@@
-169,6
+199,19
@@
file-paths:
- compare-type: ANT
pattern: 'prototypes/bifrost/**'
file-paths:
- compare-type: ANT
pattern: 'prototypes/bifrost/**'
- - compare-type: ANT
- pattern: 'jjb/infra/**'
readable-message: true
readable-message: true
+
+#---------------------------
+# builder macros
+#---------------------------
+- builder:
+ name: bifrost-set-name
+ builders:
+ - description-setter:
+ description: "Built on $NODE_NAME"
+
+- builder:
+ name: bifrost-build
+ builders:
+ - shell:
+ !include-raw: ./bifrost-verify.sh