Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bugfix: fix the wrong extraction of image_id"
[releng.git]
/
jjb
/
functest
/
functest-ci-jobs.yml
diff --git
a/jjb/functest/functest-ci-jobs.yml
b/jjb/functest/functest-ci-jobs.yml
index
afeb1f9
..
f8fdeb8
100644
(file)
--- a/
jjb/functest/functest-ci-jobs.yml
+++ b/
jjb/functest/functest-ci-jobs.yml
@@
-113,6
+113,11
@@
slave-label: armband-virtual
installer: fuel
<<: *colorado
slave-label: armband-virtual
installer: fuel
<<: *colorado
+# netvirt 3rd party ci
+ - virtual:
+ slave-label: odl-netvirt-virtual
+ installer: netvirt
+ <<: *master
#--------------------------------
# None-CI PODs
#--------------------------------
#--------------------------------
# None-CI PODs
#--------------------------------
@@
-214,6
+219,8
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults'
- 'functest-{testsuite}-parameter'
- '{installer}-defaults'
- '{slave-label}-defaults'
- 'functest-{testsuite}-parameter'
@@
-224,14
+231,15
@@
name: DOCKER_TAG
default: '{docker-tag}'
description: 'Tag to pull docker image'
name: DOCKER_TAG
default: '{docker-tag}'
description: 'Tag to pull docker image'
+ - string:
+ name: CLEAN_DOCKER_IMAGES
+ default: 'false'
+ description: 'Remove downloaded docker images (opnfv/functest:*)'
- functest-parameter:
gs-pathname: '{gs-pathname}'
scm:
- functest-parameter:
gs-pathname: '{gs-pathname}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- description-setter:
builders:
- description-setter:
@@
-280,7
+288,7
@@
- string:
name: TESTCASE_OPTIONS
default: ''
- string:
name: TESTCASE_OPTIONS
default: ''
- description: 'Addtional parameters specific to test case(s)'
+ description: 'Add
i
tional parameters specific to test case(s)'
- parameter:
name: functest-parameter
parameters:
- parameter:
name: functest-parameter
parameters:
@@
-300,6
+308,10
@@
name: CI_DEBUG
default: 'false'
description: "Show debug output information"
name: CI_DEBUG
default: 'false'
description: "Show debug output information"
+ - string:
+ name: RC_FILE_PATH
+ default: ''
+ description: "Path to the OS credentials file if given"
########################
# trigger macros
########################
########################
# trigger macros
########################