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-verify-testfw.yaml
diff --git
a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
index c4c26cdf25a4d997bcaf83624cfb9508bcd8c30c..2f76b720d1b8f360f6aaf401631ad36cd07b7857 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-verify-testfw.yaml
+++ b/
jjb/cloud-infra/cloud-infra-verify-testfw.yaml
@@
-93,6
+93,10
@@
name: DISTRIBUTION
default: '{distribution}'
description: 'Distribution to use for configuring target nodes (networking etc.)'
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: DEPLOY_SCENARIO
default: 'k8-calico-nofeature'
- string:
name: DEPLOY_SCENARIO
default: 'k8-calico-nofeature'
@@
-101,6
+105,10
@@
name: TEST_SUITE
default: 'healthcheck'
description: 'Test suite to run'
name: TEST_SUITE
default: 'healthcheck'
description: 'Test suite to run'
+ - string:
+ name: YARDSTICK_DISPATCHER
+ default: 'file'
+ description: 'Dispatcher to use for Yardstick reporting'
- string:
name: CLEANUP
default: 'true'
- string:
name: CLEANUP
default: 'true'
@@
-146,6
+154,7
@@
DISTRIBUTION=$DISTRIBUTION
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
DISTRIBUTION=$DISTRIBUTION
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
+ YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
@@
-163,8
+172,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
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
@@
-193,6
+204,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: DEPLOY_SCENARIO
default: 'k8-calico-nofeature'
- string:
name: DEPLOY_SCENARIO
default: 'k8-calico-nofeature'
@@
-209,6
+224,10
@@
name: TEST_REPO_URL
default: 'https://gerrit.nordix.org/infra/test.git'
description: 'URL to Nordix Cloud Infra test repository'
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'
- string:
name: CLEANUP
default: 'false'
@@
-225,16
+244,6
@@
refspec: $GERRIT_REFSPEC
builders:
refspec: $GERRIT_REFSPEC
builders:
- - 'cloud-infra-verify-testfw-macro'
-
-# -------------------------------
-# builder macros
-# -------------------------------
-
-- builder:
- name: 'cloud-infra-verify-testfw-macro'
- builders:
- - shell:
- !include-raw: ./cloud-infra-test.sh
+ - 'cloud-infra-testfw-macro'
# vim: set ts=2 sw=2 expandtab:
# vim: set ts=2 sw=2 expandtab: