Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix a nit
[releng.git]
/
jjb
/
functest
/
functest.yaml
diff --git
a/jjb/functest/functest.yaml
b/jjb/functest/functest.yaml
index
9afa64b
..
544021b
100644
(file)
--- a/
jjb/functest/functest.yaml
+++ b/
jjb/functest/functest.yaml
@@
-10,10
+10,6
@@
tag:
- latest:
branch: master
tag:
- latest:
branch: master
- - hunter:
- branch: stable/hunter
- - gambia:
- branch: stable/gambia
- parameter:
name: functest-slave
- parameter:
name: functest-slave
@@
-98,9
+94,12
@@
fi
sudo docker run --rm \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
fi
sudo docker run --rm \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
- -e EXTERNAL_NETWORK=public
1
\
+ -e EXTERNAL_NETWORK=public \
-v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-v /home/opnfv/functest/images:/home/opnfv/functest/images \
-v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-v /home/opnfv/functest/images:/home/opnfv/functest/images \
+ -v /home/opnfv/functest/tempest_blacklist.yaml:\
+ /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\
+ tempest/custom_tests/blacklist.yaml \
$image run_tests -t {test}
res=$?
gsutil -m cp -r $WORKSPACE/ \
$image run_tests -t {test}
res=$?
gsutil -m cp -r $WORKSPACE/ \
@@
-298,6
+297,7
@@
test:
- tempest_full
- tempest_scenario
test:
- tempest_full
- tempest_scenario
+ - rally_full
jobs:
- 'functest-{repo}-{container}-{tag}-{test}-run'
jobs:
- 'functest-{repo}-{container}-{tag}-{test}-run'
@@
-440,6
+440,8
@@
<<: *functest-jobs
- name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
<<: *functest-jobs
<<: *functest-jobs
- name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-vnf:{tag}
projects:
- multijob:
name: opnfv/functest-vnf:{tag}
projects:
@@
-725,6
+727,8
@@
<<: *functest-jobs
- name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
<<: *functest-jobs
<<: *functest-jobs
- name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-vnf:{tag}
projects:
- multijob:
name: opnfv/functest-vnf:{tag}
projects:
@@
-910,6
+914,8
@@
<<: *functest-jobs
- name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
<<: *functest-jobs
<<: *functest-jobs
- name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-vnf:{tag}
projects:
- multijob:
name: opnfv/functest-vnf:{tag}
projects: