Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update block rules on nodes
[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
5a0e321
..
043e40f
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
@@
-117,9
+117,7
@@
- '{installer}-defaults'
- '{slave-label}-defaults':
installer: '{installer}'
- '{installer}-defaults'
- '{slave-label}-defaults':
installer: '{installer}'
- - string:
- name: DEPLOY_SCENARIO
- default: '{scenario}'
+ - 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
@@
-129,7
+127,7
@@
- 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}
INSTALLER_VERSION={stream}
UPSTREAM_JOB_NAME=$JOB_NAME
DEPLOY_SCENARIO={scenario}
INSTALLER_VERSION={stream}
UPSTREAM_JOB_NAME=$JOB_NAME
@@
-139,7
+137,7
@@
- trigger-builds:
- project: 'functest-daisy-{pod}-daily-{stream}'
current-parameters: false
- trigger-builds:
- project: 'functest-daisy-{pod}-daily-{stream}'
current-parameters: false
- predefined-parameters:
+ predefined-parameters:
|
DEPLOY_SCENARIO={scenario}
INSTALLER_VERSION={stream}
UPSTREAM_JOB_NAME=$JOB_NAME
DEPLOY_SCENARIO={scenario}
INSTALLER_VERSION={stream}
UPSTREAM_JOB_NAME=$JOB_NAME
@@
-163,7
+161,7
@@
- 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}
INSTALLER_VERSION={stream}
UPSTREAM_JOB_NAME=$JOB_NAME
DEPLOY_SCENARIO={scenario}
INSTALLER_VERSION={stream}
UPSTREAM_JOB_NAME=$JOB_NAME
@@
-192,8
+190,10
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'daisy.*-deploy-({pod})?-daily-.*'
- 'daisy-kolla-build-.*'
- 'daisy-kolla-build-.*'
+ - '{installer}-daily-(build|deploy|test)-(euphrates|master)'
+ - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
+ - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
block-level: 'NODE'
parameters:
block-level: 'NODE'
parameters:
@@
-203,9
+203,7
@@
- '{installer}-defaults'
- '{slave-label}-defaults':
installer: '{installer}'
- '{installer}-defaults'
- '{slave-label}-defaults':
installer: '{installer}'
- - string:
- name: DEPLOY_SCENARIO
- default: 'os-nosdn-nofeature-ha'
+ - 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
- string:
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
- string: