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: Switch to build throttling
[infra/cicd.git]
/
jjb
/
engine
/
verify-jobs
/
engine-verify-deploy-test.yaml
diff --git
a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
index faf27d461d8460cb96da023b1f50d18edaa5f1b4..c4f6f75b0d7d6cc82b2e31f244457f317713f36c 100644
(file)
--- a/
jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
+++ b/
jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
@@
-30,8
+30,6
@@
- online:
disabled: false
execution-mode: online-deployment
- online:
disabled: false
execution-mode: online-deployment
- pdf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml'
- idf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml'
successful: false
failed: false
unstable: false
successful: false
failed: false
unstable: false
@@
-39,8
+37,6
@@
- offline:
disabled: false
execution-mode: offline-deployment
- offline:
disabled: false
execution-mode: offline-deployment
- pdf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-pdf.yml'
- idf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-idf.yml'
successful: false
failed: false
unstable: false
successful: false
failed: false
unstable: false
@@
-55,10
+51,14
@@
provisioner-type: 'bifrost'
slave-type: 'vpod'
gated-projects: 'infra/engine|infra/provisioner/bifrost'
provisioner-type: 'bifrost'
slave-type: 'vpod'
gated-projects: 'infra/engine|infra/provisioner/bifrost'
+ pdf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml'
+ idf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml'
- cloud:
provisioner-type: 'heat'
slave-type: 'jumphost'
gated-projects: 'infra/engine|infra/provisioner/heat'
- cloud:
provisioner-type: 'heat'
slave-type: 'jumphost'
gated-projects: 'infra/engine|infra/provisioner/heat'
+ pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-city-ubuntu1804.yaml"
+ idf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-idf.yaml"
distro:
- ubuntu1804
distro:
- ubuntu1804
@@
-110,11
+110,11
@@
description: 'Name of heat-environment file to use.'
- string:
name: HEAT_STACK_NAME
description: 'Name of heat-environment file to use.'
- string:
name: HEAT_STACK_NAME
- default: "nordix-cicd-verify-engine-
online
-{distro}-$GERRIT_CHANGE_NUMBER"
+ default: "nordix-cicd-verify-engine-
{environment-type}
-{distro}-$GERRIT_CHANGE_NUMBER"
description: 'Name of the created stack'
- string:
name: KEYPAIR_NAME
description: 'Name of the created stack'
- string:
name: KEYPAIR_NAME
- default: "keypair-nordix-cicd-verify-engine-
online
-{distro}-$GERRIT_CHANGE_NUMBER"
+ default: "keypair-nordix-cicd-verify-engine-
{environment-type}
-{distro}-$GERRIT_CHANGE_NUMBER"
description: 'Name of the created keypair'
- string:
name: USE_PREBUILT_DEPLOYMENT_IMAGE
description: 'Name of the created keypair'
- string:
name: USE_PREBUILT_DEPLOYMENT_IMAGE
@@
-156,16
+156,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: