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
OpenDaylight: Improve jenkins jobs for OpenDaylight projects
[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..110705c083fb157d7d6239c5626a4c3bb07b017e 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-verify-testfw.yaml
+++ b/
jjb/cloud-infra/cloud-infra-verify-testfw.yaml
@@
-52,13
+52,9
@@
branch: '{stream}'
disabled: 'false'
branch: '{stream}'
disabled: 'false'
-
os
:
+
distro
:
- ubuntu1804:
disabled: 'false'
- ubuntu1804:
disabled: 'false'
- distribution: 'ubuntu18'
- - centos7:
- disabled: 'true'
- distribution: 'centos7'
type:
- virtual
type:
- virtual
@@
-68,11
+64,11
@@
- yardstick
jobs:
- yardstick
jobs:
- - 'cloud-infra-verify-testfw-{
os
}-{type}-{stream}'
- - 'cloud-infra-verify-testfw-{
os
}-{phase}-{type}-{stream}'
+ - 'cloud-infra-verify-testfw-{
distro
}-{type}-{stream}'
+ - 'cloud-infra-verify-testfw-{
distro
}-{phase}-{type}-{stream}'
- job-template:
- job-template:
- name: 'cloud-infra-verify-testfw-{
os
}-{type}-{stream}'
+ name: 'cloud-infra-verify-testfw-{
distro
}-{type}-{stream}'
project-type: multijob
project-type: multijob
@@
-87,12
+83,16
@@
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- default: 'vpod-test-{
os
}'
+ default: 'vpod-test-{
distro
}'
description: 'Slave label to schedule this job on. These slaves have cloud infra installed on them.'
- string:
description: 'Slave label to schedule this job on. These slaves have cloud infra installed on them.'
- string:
- name: DISTR
IBUTION
- default: '{distr
ibution
}'
+ name: DISTR
O
+ default: '{distr
o
}'
description: 'Distribution to use for configuring target nodes (networking etc.)'
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
+101,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'
@@
-111,7
+115,7
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'cloud-infra-verify-testfw-{
os
}-.*'
+ - 'cloud-infra-verify-testfw-{
distro
}-.*'
block-level: 'NODE'
- throttle:
max-per-node: 1
block-level: 'NODE'
- throttle:
max-per-node: 1
@@
-128,6
+132,8
@@
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: $GERRIT_REFSPEC
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: $GERRIT_REFSPEC
+ wipe_workspace: true
+ clean_before: false
triggers:
- nordix-gerrit-trigger-patchset-created:
triggers:
- nordix-gerrit-trigger-patchset-created:
@@
-140,12
+146,13
@@
name: functest
condition: SUCCESSFUL
projects:
name: functest
condition: SUCCESSFUL
projects:
- - name: 'cloud-infra-verify-testfw-{
os
}-functest-{type}-{stream}'
+ - name: 'cloud-infra-verify-testfw-{
distro
}-functest-{type}-{stream}'
current-parameters: true
predefined-parameters: |
current-parameters: true
predefined-parameters: |
- DISTR
IBUTION=$DISTRIBUTION
+ DISTR
O=$DISTRO
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
@@
-159,12
+166,14
@@
name: yardstick
condition: SUCCESSFUL
projects:
name: yardstick
condition: SUCCESSFUL
projects:
- - name: 'cloud-infra-verify-testfw-{
os
}-yardstick-{type}-{stream}'
+ - name: 'cloud-infra-verify-testfw-{
distro
}-yardstick-{type}-{stream}'
current-parameters: true
predefined-parameters: |
current-parameters: true
predefined-parameters: |
- DISTRIBUTION=$DISTRIBUTION
+ DISTRO=$DISTRO
+ 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
@@
-176,7
+185,7
@@
abort-all-job: true
- job-template:
abort-all-job: true
- job-template:
- name: 'cloud-infra-verify-testfw-{
os
}-{phase}-{type}-{stream}'
+ name: 'cloud-infra-verify-testfw-{
distro
}-{phase}-{type}-{stream}'
disabled: false
disabled: false
@@
-190,9
+199,13
@@
name: PROJECT
default: $GERRIT_PROJECT
- string:
name: PROJECT
default: $GERRIT_PROJECT
- string:
- name: DISTR
IBUTION
- default: 'ubuntu18'
+ name: DISTR
O
+ default: 'ubuntu18
04
'
description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
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
+222,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'
@@
-223,18
+240,10
@@
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: $GERRIT_REFSPEC
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: $GERRIT_REFSPEC
+ wipe_workspace: true
+ clean_before: false
builders:
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: