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: Add links to Jenkins jobs"
[releng.git]
/
jjb
/
daisy4nfv
/
daisy4nfv-verify-jobs.yml
diff --git
a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index
6444cf8
..
82532b2
100644
(file)
--- a/
jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/
jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@
-1,9
+1,7
@@
- project:
name: 'daisy4nfv-verify-jobs'
- project:
name: 'daisy4nfv-verify-jobs'
- project: 'daisy4nfv'
-
- installer: 'daisy4nfv'
+ project: 'daisy'
#####################################
# branch definitions
#####################################
#####################################
# branch definitions
#####################################
@@
-17,9
+15,9
@@
#####################################
phase:
- 'basic':
#####################################
phase:
- 'basic':
- slave-label: 'opnfv-build'
+ slave-label: 'opnfv-build
-centos
'
- 'build':
- 'build':
- slave-label: 'opnfv-build-
ubuntu
'
+ slave-label: 'opnfv-build-
centos
'
- 'deploy-virtual':
slave-label: 'opnfv-build'
- 'smoke-test':
- 'deploy-virtual':
slave-label: 'opnfv-build'
- 'smoke-test':
@@
-43,27
+41,24
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-total: 4
option: 'project'
scm:
- throttle:
enabled: true
max-total: 4
option: 'project'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
triggers:
- gerrit:
- timeout:
timeout: 360
fail: true
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
@@
-103,6
+98,11
@@
projects:
- name: 'daisy4nfv-verify-basic-{stream}'
current-parameters: false
projects:
- name: 'daisy4nfv-verify-basic-{stream}'
current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
@@
-112,6
+112,11
@@
projects:
- name: 'daisy4nfv-verify-build-{stream}'
current-parameters: false
projects:
- name: 'daisy4nfv-verify-build-{stream}'
current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
@@
-121,6
+126,11
@@
projects:
- name: 'daisy4nfv-verify-deploy-virtual-{stream}'
current-parameters: false
projects:
- name: 'daisy4nfv-verify-deploy-virtual-{stream}'
current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
@@
-130,6
+140,11
@@
projects:
- name: 'daisy4nfv-verify-smoke-test-{stream}'
current-parameters: false
projects:
- name: 'daisy4nfv-verify-smoke-test-{stream}'
current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
@@
-142,6
+157,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-total: 6
- throttle:
enabled: true
max-total: 6
@@
-154,15
+170,10
@@
block-level: 'NODE'
scm:
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 360
fail: true
- timeout:
timeout: 360
fail: true
@@
-184,25
+195,25
@@
# builder macros
#####################################
- builder:
# builder macros
#####################################
- builder:
- name: 'daisy
4nfv
-verify-basic-macro'
+ name: 'daisy-verify-basic-macro'
builders:
- shell:
!include-raw: ./daisy4nfv-basic.sh
- builder:
builders:
- shell:
!include-raw: ./daisy4nfv-basic.sh
- builder:
- name: 'daisy
4nfv
-verify-build-macro'
+ name: 'daisy-verify-build-macro'
builders:
- shell:
!include-raw: ./daisy4nfv-build.sh
- builder:
builders:
- shell:
!include-raw: ./daisy4nfv-build.sh
- builder:
- name: 'daisy
4nfv
-verify-deploy-virtual-macro'
+ name: 'daisy-verify-deploy-virtual-macro'
builders:
- shell:
!include-raw: ./daisy4nfv-virtual-deploy.sh
- builder:
builders:
- shell:
!include-raw: ./daisy4nfv-virtual-deploy.sh
- builder:
- name: 'daisy
4nfv
-verify-smoke-test-macro'
+ name: 'daisy-verify-smoke-test-macro'
builders:
- shell: |
#!/bin/bash
builders:
- shell: |
#!/bin/bash