Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
engine: Adapt testing to stack oriented framework
[infra/cicd.git]
/
jjb
/
engine
/
verify-jobs
/
kubernetes-verify-deploy-test.yaml
diff --git
a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
index 658f80ab504523697f0661c1513ce81fa16741ef..4093ba5b9e1bbbeae8e357e243f981dc883e62d5 100644
(file)
--- a/
jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
+++ b/
jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
@@
-22,13
+22,19
@@
project: 'kubernetes-verify-deploy-test'
project: 'kubernetes-verify-deploy-test'
+ # NOTE (fdegir): dot is not an allowed character in groovy var names and also for
+ # naming openstack objects so stream is used for that purpose but branch points to
+ # actual branch name on gerrit
stream:
- 'master':
stream:
- 'master':
- branch: '{stream}'
- - '1.17':
- branch: '{stream}'
- - '1.15':
- branch: '{stream}'
+ branch: 'master'
+ deploy-scenario: 'k8-multus-plugins'
+ - '1_17':
+ branch: '1.17'
+ deploy-scenario: 'k8-multus-plugins'
+ - '1_15':
+ branch: '1.15'
+ deploy-scenario: 'k8-calico-nofeature'
environment-type:
- online:
environment-type:
- online:
@@
-88,6
+94,14
@@
concurrent: true
parameters:
concurrent: true
parameters:
+ - string:
+ name: DEPLOY_SCENARIO
+ default: '{deploy-scenario}'
+ description: 'Scenario to test change with. This depends on the branch of the stack'
+ - string:
+ name: DISTRO
+ default: '{distro}'
+ description: 'Distribution to use for configuring target nodes (networking etc.)'
- label:
name: SLAVE_LABEL
default: 'engine-{slave-type}-{environment-type}-{distro}-fra'
- label:
name: SLAVE_LABEL
default: 'engine-{slave-type}-{environment-type}-{distro}-fra'
@@
-160,16
+174,14
@@
properties:
- logrotate
properties:
- logrotate
- - build-blocker:
- use-build-blocker: true
- blocking-jobs:
- - '.*?-verify-online-deploy-test-.*'
- - '.*?-verify-offline-deploy-test-.*'
- block-level: 'NODE'
+ # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
- throttle:
- throttle:
+ enabled: true
max-per-node: 1
max-per-node: 1
- max-total: 3
- option: project
+ max-total: 8
+ option: category
+ categories:
+ - engine-verify-deploy-test
scm:
- git-scm-gerrit:
scm:
- git-scm-gerrit: