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
Set yardstick dispatcher for testfw verify jobs
[infra/cicd.git]
/
jjb
/
cloud-infra
/
cloud-infra-periodic-engine.yaml
diff --git
a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 708b1600f19898835a0f33a3b6395562c43b5b8c..753c0b95758b4254fed590c4651b59e3bca2e4ec 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/
jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@
-60,11
+60,20
@@
dib_os_element: 'centos-minimal'
type:
dib_os_element: 'centos-minimal'
type:
- - virtual
+ - virtual:
+ slave-label: 'vpod-deploy-city'
+ yardstick-dispatcher: 'file'
+ - baremetal:
+ slave-label: 'baremetal-deploy'
+ yardstick-dispatcher: 'influxdb'
phase:
phase:
- - deploy
- - functest
+ - deploy:
+ build-timeout: 60
+ - functest:
+ build-timeout: 120
+ - yardstick:
+ build-timeout: 30
jobs:
- 'cloud-infra-periodic-engine-{os}-{type}-{stream}'
jobs:
- 'cloud-infra-periodic-engine-{os}-{type}-{stream}'
@@
-86,12
+95,16
@@
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- default: '
vpod-deploy-city
'
+ default: '
{slave-label}
'
description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
- string:
name: DISTRIBUTION
default: '{distribution}'
description: 'Distribution to use for configuring target nodes (networking etc.)'
description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
- string:
name: DISTRIBUTION
default: '{distribution}'
description: 'Distribution to use for configuring target nodes (networking etc.)'
+ - string:
+ name: DEPLOY_TYPE
+ default: '{type}'
+ description: 'Type of the deployment'
- string:
name: USE_PREBUILT_DEPLOYMENT_IMAGE
default: 'true'
- string:
name: USE_PREBUILT_DEPLOYMENT_IMAGE
default: 'true'
@@
-114,8
+127,12
@@
description: 'Scenario to deploy and test'
- string:
name: TEST_SUITE
description: 'Scenario to deploy and test'
- string:
name: TEST_SUITE
- default: '
healthcheck
'
+ default: '
smoke
'
description: 'Test suite to run'
description: 'Test suite to run'
+ - string:
+ name: YARDSTICK_DISPATCHER
+ default: '{yardstick-dispatcher}'
+ description: 'Dispatcher to use for Yardstick reporting'
- string:
name: CLEANUP
default: 'true'
- string:
name: CLEANUP
default: 'true'
@@
-127,6
+144,7
@@
use-build-blocker: true
blocking-jobs:
- 'cloud-infra-verify-engine-{os}-.*'
use-build-blocker: true
blocking-jobs:
- 'cloud-infra-verify-engine-{os}-.*'
+ - 'cloud-infra-verify-scenario-{os}-.*'
- 'cloud-infra-periodic-engine-{os}-.*'
- 'cloud-infra-os-.*'
- 'cloud-infra-k8-.*'
- 'cloud-infra-periodic-engine-{os}-.*'
- 'cloud-infra-os-.*'
- 'cloud-infra-k8-.*'
@@
-138,7
+156,7
@@
wrappers:
- build-timeout:
wrappers:
- build-timeout:
- timeout:
12
0
+ timeout:
21
0
- fix-workspace-permissions
scm:
- fix-workspace-permissions
scm:
@@
-148,7
+166,7
@@
refspec: ''
triggers:
refspec: ''
triggers:
- - timed: 'H H/
2
* * *'
+ - timed: 'H H/
3
* * *'
builders:
- multijob:
builders:
- multijob:
@@
-159,6
+177,7
@@
current-parameters: true
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
current-parameters: true
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
+ DEPLOY_TYPE=$DEPLOY_TYPE
USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
DIB_OS_RELEASE=$DIB_OS_RELEASE
USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
DIB_OS_RELEASE=$DIB_OS_RELEASE
@@
-177,8
+196,10
@@
current-parameters: true
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
current-parameters: true
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
+ DEPLOY_TYPE=$DEPLOY_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
+ YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
CLEANUP=$CLEANUP
node-parameters: true
kill-phase-on: NEVER
CLEANUP=$CLEANUP
node-parameters: true
kill-phase-on: NEVER
@@
-191,8
+212,10
@@
current-parameters: true
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
current-parameters: true
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
+ DEPLOY_TYPE=$DEPLOY_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
+ YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
CLEANUP=$CLEANUP
node-parameters: true
kill-phase-on: NEVER
CLEANUP=$CLEANUP
node-parameters: true
kill-phase-on: NEVER
@@
-216,6
+239,10
@@
name: DISTRIBUTION
default: 'ubuntu18'
description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
name: DISTRIBUTION
default: 'ubuntu18'
description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
+ - string:
+ name: DEPLOY_TYPE
+ default: 'virtual'
+ description: 'Type of the deployment. Overriden by upstream job.'
- string:
name: USE_PREBUILT_DEPLOYMENT_IMAGE
default: 'false'
- string:
name: USE_PREBUILT_DEPLOYMENT_IMAGE
default: 'false'
@@
-246,19
+273,23
@@
description: 'Test framework to use'
- string:
name: TEST_SUITE
description: 'Test framework to use'
- string:
name: TEST_SUITE
- default: '
healthcheck
'
+ default: '
smoke
'
description: 'Test suite to run'
- string:
name: TEST_REPO_URL
default: 'https://gerrit.nordix.org/infra/test.git'
description: 'URL to Nordix Cloud Infra test repository'
description: 'Test suite to run'
- string:
name: TEST_REPO_URL
default: 'https://gerrit.nordix.org/infra/test.git'
description: 'URL to Nordix Cloud Infra test repository'
+ - string:
+ name: YARDSTICK_DISPATCHER
+ default: 'file'
+ description: 'Dispatcher to use for Yardstick reporting'
- string:
name: CLEANUP
default: 'false'
wrappers:
- build-timeout:
- string:
name: CLEANUP
default: 'false'
wrappers:
- build-timeout:
- timeout:
120
+ timeout:
'{build-timeout}'
- fix-workspace-permissions
scm:
- fix-workspace-permissions
scm: