Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
add another ovs_dpdk scenarios trigers
[releng.git]
/
jjb
/
daisy4nfv
/
daisy-daily-jobs.yml
diff --git
a/jjb/daisy4nfv/daisy-daily-jobs.yml
b/jjb/daisy4nfv/daisy-daily-jobs.yml
index
3aa9505
..
6b10693
100644
(file)
--- a/
jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/
jjb/daisy4nfv/daisy-daily-jobs.yml
@@
-32,24
+32,24
@@
# CI PODs
# -------------------------------
pod:
# CI PODs
# -------------------------------
pod:
- # - baremetal:
- # slave-label: daisy-baremetal
- # <<: *master
- - virtual:
- slave-label: daisy-virtual
- <<: *master
- baremetal:
slave-label: daisy-baremetal
- baremetal:
slave-label: daisy-baremetal
- <<: *
euphrates
+ <<: *
master
- virtual:
slave-label: daisy-virtual
- virtual:
slave-label: daisy-virtual
- <<: *euphrates
+ <<: *master
+ # - baremetal:
+ # slave-label: daisy-baremetal
+ # <<: *euphrates
+ # - virtual:
+ # slave-label: daisy-virtual
+ # <<: *euphrates
# -------------------------------
# None-CI PODs
# -------------------------------
# -------------------------------
# None-CI PODs
# -------------------------------
- - baremetal:
- slave-label: zte-pod3
- <<: *master
+
#
- baremetal:
+
#
slave-label: zte-pod3
+
#
<<: *master
- zte-pod9:
slave-label: zte-pod9
<<: *master
- zte-pod9:
slave-label: zte-pod9
<<: *master
@@
-120,6
+120,15
@@
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
+ - string:
+ name: INSTALLER_VERSION
+ default: ''
+ - string:
+ name: UPSTREAM_JOB_NAME
+ default: ''
+ - string:
+ name: UPSTREAM_BUILD_ID
+ default: ''
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
@@
-129,15
+138,21
@@
- trigger-builds:
- project: 'daisy-deploy-{pod}-daily-{stream}'
current-parameters: false
- trigger-builds:
- project: 'daisy-deploy-{pod}-daily-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters:
|
DEPLOY_SCENARIO={scenario}
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
+ UPSTREAM_JOB_NAME=$JOB_NAME
+ UPSTREAM_BUILD_ID=$BUILD_ID
same-node: true
block: true
- trigger-builds:
- project: 'functest-daisy-{pod}-daily-{stream}'
current-parameters: false
same-node: true
block: true
- trigger-builds:
- project: 'functest-daisy-{pod}-daily-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters:
|
DEPLOY_SCENARIO={scenario}
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
+ UPSTREAM_JOB_NAME=$JOB_NAME
+ UPSTREAM_BUILD_ID=$BUILD_ID
same-node: true
block: true
block-thresholds:
same-node: true
block: true
block-thresholds:
@@
-157,8
+172,11
@@
- trigger-builds:
- project: 'yardstick-daisy-{pod}-daily-{stream}'
current-parameters: false
- trigger-builds:
- project: 'yardstick-daisy-{pod}-daily-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters:
|
DEPLOY_SCENARIO={scenario}
DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
+ UPSTREAM_JOB_NAME=$JOB_NAME
+ UPSTREAM_BUILD_ID=$BUILD_ID
block: true
same-node: true
block-thresholds:
block: true
same-node: true
block-thresholds:
@@
-214,10
+232,13
@@
builders:
- description-setter:
description: "POD: $NODE_NAME"
builders:
- description-setter:
description: "POD: $NODE_NAME"
+ - 'track-begin-timestamp'
- shell:
!include-raw-escape: ./daisy4nfv-download-artifact.sh
- shell:
!include-raw-escape: ./daisy-deploy.sh
- shell:
!include-raw-escape: ./daisy4nfv-download-artifact.sh
- shell:
!include-raw-escape: ./daisy-deploy.sh
+ publishers:
+ - 'report-provision-result'
########################
# trigger macros
########################
# trigger macros
@@
-325,7
+346,7
@@
- trigger:
name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger'
triggers:
- trigger:
name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger'
triggers:
- - timed: '0 10 * * *'
+ - timed: '0 10
,20
* * *'
# Basic HA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger'
# Basic HA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger'