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 "Revert "[doctor] not to reset verified status with experimental jobs""
[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
be3cf9a
..
4c106fc
100644
(file)
--- a/
jjb/infra/bifrost-verify-jobs.yml
+++ b/
jjb/infra/bifrost-verify-jobs.yml
@@
-36,12
+36,8
@@
disabled: false
dib-os-release: '42.2'
dib-os-element: 'opensuse-minimal'
disabled: false
dib-os-release: '42.2'
dib-os-element: 'opensuse-minimal'
- # python-xml is needed until https://review.openstack.org/#/c/400150/ is merged
- dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl,python-xml'
+ dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
extra-dib-elements: 'openssh-server'
extra-dib-elements: 'openssh-server'
- vm-disk: '30'
- vm-memory: '4096'
- vm-cpu: '2'
#--------------------------------
# type
#--------------------------------
#--------------------------------
# type
#--------------------------------
@@
-58,9
+54,9
@@
#--------------------------------
- defaults:
name: vm_defaults
#--------------------------------
- defaults:
name: vm_defaults
- vm-disk: '
10
0'
- vm-memory: '
8192
'
- vm-cpu: '
4
'
+ vm-disk: '
3
0'
+ vm-memory: '
4096
'
+ vm-cpu: '
2
'
#--------------------------------
# job templates
#--------------------------------
# job templates
@@
-75,6
+71,7
@@
concurrent: false
properties:
concurrent: false
properties:
+ - logrotate-default
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
@@
-121,6
+118,9
@@
- label:
name: SLAVE_LABEL
default: 'infra-{type}-{distro}'
- 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:
@@
-138,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:
@@
-162,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'
@@
-191,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'
@@
-200,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