projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Bug 2012 use existing volumes as instantiation parameters
[osm/RO.git]
/
tox.ini
diff --git
a/tox.ini
b/tox.ini
index
699ff96
..
ca1afaf
100644
(file)
--- a/
tox.ini
+++ b/
tox.ini
@@
-16,7
+16,7
@@
#######################################################################################
[tox]
#######################################################################################
[tox]
-envlist = black, flake8, safety
+envlist = black, flake8, safety
, cover
[tox:jenkins]
toxworkdir = /tmp/.tox
[tox:jenkins]
toxworkdir = /tmp/.tox
@@
-34,8
+34,10
@@
parallel_show_output = true
[testenv:release_notes]
deps = reno
skip_install = true
[testenv:release_notes]
deps = reno
skip_install = true
+whitelist_externals = bash
commands =
reno new {posargs:new_feature}
commands =
reno new {posargs:new_feature}
+ bash -c "sed -i -e '1 e head -16 tox.ini' releasenotes/notes/{posargs:new_feature}*.yaml"
#######################################################################################
#######################################################################################
@@
-77,55
+79,56
@@
commands =
nose2 -C --coverage NG-RO/osm_ng_ro -s NG-RO/osm_ng_ro
sh -c 'mv .coverage .coverage_ng_ro'
# RO-plugin
nose2 -C --coverage NG-RO/osm_ng_ro -s NG-RO/osm_ng_ro
sh -c 'mv .coverage .coverage_ng_ro'
# RO-plugin
- nose2 -C --coverage RO-plugin/osm_ro_plugin -s RO-plugin/osm_ro_plugin
- sh -c 'mv .coverage .coverage_ro_plugin'
+
#
nose2 -C --coverage RO-plugin/osm_ro_plugin -s RO-plugin/osm_ro_plugin
+
#
sh -c 'mv .coverage .coverage_ro_plugin'
# RO-SDN-arista_cloudvision
# RO-SDN-arista_cloudvision
- nose2 -C --coverage RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision -s RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision
- sh -c 'mv .coverage .coverage_rosdn_arista_cloudvision'
+
#
nose2 -C --coverage RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision -s RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision
+
#
sh -c 'mv .coverage .coverage_rosdn_arista_cloudvision'
# RO-SDN-dpb
# RO-SDN-dpb
- nose2 -C --coverage RO-SDN-dpb/osm_rosdn_dpb -s RO-SDN-dpb/osm_rosdn_dpb
- sh -c 'mv .coverage .coverage_rosdn_dpb'
+
#
nose2 -C --coverage RO-SDN-dpb/osm_rosdn_dpb -s RO-SDN-dpb/osm_rosdn_dpb
+
#
sh -c 'mv .coverage .coverage_rosdn_dpb'
# RO-SDN-dynpac
# RO-SDN-dynpac
- nose2 -C --coverage RO-SDN-dynpac/osm_rosdn_dynpac -s RO-SDN-dynpac/osm_rosdn_dynpac
- sh -c 'mv .coverage .coverage_rosdn_dynpac'
+
#
nose2 -C --coverage RO-SDN-dynpac/osm_rosdn_dynpac -s RO-SDN-dynpac/osm_rosdn_dynpac
+
#
sh -c 'mv .coverage .coverage_rosdn_dynpac'
# RO-SDN-floodlight_openflow
# RO-SDN-floodlight_openflow
- nose2 -C --coverage RO-SDN-floodlight_openflow/osm_rosdn_floodlightof -s RO-SDN-floodlight_openflow/osm_rosdn_floodlightof
- sh -c 'mv .coverage .coverage_rosdn_floodlightof'
+
#
nose2 -C --coverage RO-SDN-floodlight_openflow/osm_rosdn_floodlightof -s RO-SDN-floodlight_openflow/osm_rosdn_floodlightof
+
#
sh -c 'mv .coverage .coverage_rosdn_floodlightof'
# RO-SDN-ietfl2vpn
# RO-SDN-ietfl2vpn
- nose2 -C --coverage RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn -s RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn
- sh -c 'mv .coverage .coverage_rosdn_ietfl2vpn'
+
#
nose2 -C --coverage RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn -s RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn
+
#
sh -c 'mv .coverage .coverage_rosdn_ietfl2vpn'
# RO-SDN-juniper_contrail
# RO-SDN-juniper_contrail
- nose2 -C --coverage RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail -s RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail
- sh -c 'mv .coverage .coverage_rosdn_juniper_contrail'
+
#
nose2 -C --coverage RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail -s RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail
+
#
sh -c 'mv .coverage .coverage_rosdn_juniper_contrail'
# RO-SDN-odl_openflow
# RO-SDN-odl_openflow
- nose2 -C --coverage RO-SDN-odl_openflow/osm_rosdn_odlof -s RO-SDN-odl_openflow/osm_rosdn_odlof
- sh -c 'mv .coverage .coverage_rosdn_odlof'
+
#
nose2 -C --coverage RO-SDN-odl_openflow/osm_rosdn_odlof -s RO-SDN-odl_openflow/osm_rosdn_odlof
+
#
sh -c 'mv .coverage .coverage_rosdn_odlof'
# RO-SDN-onos_openflow
# RO-SDN-onos_openflow
- nose2 -C --coverage RO-SDN-onos_openflow/osm_rosdn_onosof -s RO-SDN-onos_openflow/osm_rosdn_onosof
- sh -c 'mv .coverage .coverage_rosdn_onosof'
+
#
nose2 -C --coverage RO-SDN-onos_openflow/osm_rosdn_onosof -s RO-SDN-onos_openflow/osm_rosdn_onosof
+
#
sh -c 'mv .coverage .coverage_rosdn_onosof'
# RO-SDN-onos_vpls
# RO-SDN-onos_vpls
- nose2 -C --coverage RO-SDN-onos_vpls/osm_rosdn_onos_vpls -s RO-SDN-onos_vpls/osm_rosdn_onos_vpls
- sh -c 'mv .coverage .coverage_rosdn_onos_vpls'
+
#
nose2 -C --coverage RO-SDN-onos_vpls/osm_rosdn_onos_vpls -s RO-SDN-onos_vpls/osm_rosdn_onos_vpls
+
#
sh -c 'mv .coverage .coverage_rosdn_onos_vpls'
# RO-VIM-aws
# RO-VIM-aws
- nose2 -C --coverage RO-VIM-aws/osm_rovim_aws -s RO-VIM-aws/osm_rovim_aws
- sh -c 'mv .coverage .coverage_rovim_aws'
+
#
nose2 -C --coverage RO-VIM-aws/osm_rovim_aws -s RO-VIM-aws/osm_rovim_aws
+
#
sh -c 'mv .coverage .coverage_rovim_aws'
# RO-VIM-azure
# RO-VIM-azure
- nose2 -C --coverage RO-VIM-azure/osm_rovim_azure -s RO-VIM-azure/osm_rovim_azure
- sh -c 'mv .coverage .coverage_rovim_azure'
+
#
nose2 -C --coverage RO-VIM-azure/osm_rovim_azure -s RO-VIM-azure/osm_rovim_azure
+
#
sh -c 'mv .coverage .coverage_rovim_azure'
# RO-VIM-openstack
# RO-VIM-openstack
-
#
nose2 -C --coverage RO-VIM-openstack/osm_rovim_openstack -s RO-VIM-openstack/osm_rovim_openstack
-
#
sh -c 'mv .coverage .coverage_rovim_openstack'
+ nose2 -C --coverage RO-VIM-openstack/osm_rovim_openstack -s RO-VIM-openstack/osm_rovim_openstack
+ sh -c 'mv .coverage .coverage_rovim_openstack'
# RO-VIM-openvim
# RO-VIM-openvim
- nose2 -C --coverage RO-VIM-openvim/osm_rovim_openvim -s RO-VIM-openvim/osm_rovim_openvim
- sh -c 'mv .coverage .coverage_rovim_openvim'
+
#
nose2 -C --coverage RO-VIM-openvim/osm_rovim_openvim -s RO-VIM-openvim/osm_rovim_openvim
+
#
sh -c 'mv .coverage .coverage_rovim_openvim'
# RO-VIM-vmware
# nose2 -C --coverage RO-VIM-vmware/osm_rovim_vmware -s RO-VIM-vmware/osm_rovim_vmware
# sh -c 'mv .coverage .coverage_rovim_vmware'
# RO-VIM-gcp
# RO-VIM-vmware
# nose2 -C --coverage RO-VIM-vmware/osm_rovim_vmware -s RO-VIM-vmware/osm_rovim_vmware
# sh -c 'mv .coverage .coverage_rovim_vmware'
# RO-VIM-gcp
- nose2 -C --coverage RO-VIM-gcp/osm_rovim_gcp -s RO-VIM-gcp/osm_rovim_gcp
- sh -c 'mv .coverage .coverage_rovim_gcp'
+
#
nose2 -C --coverage RO-VIM-gcp/osm_rovim_gcp -s RO-VIM-gcp/osm_rovim_gcp
+
#
sh -c 'mv .coverage .coverage_rovim_gcp'
# Combine results and generate reports
# Combine results and generate reports
- coverage combine .coverage_ng_ro .coverage_ro_plugin .coverage_rosdn_arista_cloudvision .coverage_rosdn_dpb .coverage_rosdn_dynpac .coverage_rosdn_floodlightof .coverage_rosdn_ietfl2vpn .coverage_rosdn_juniper_contrail .coverage_rosdn_odlof .coverage_rosdn_onos_vpls .coverage_rosdn_onosof .coverage_rovim_aws .coverage_rovim_azure .coverage_rovim_openvim .coverage_rovim_gcp # .coverage_rovim_openstack .coverage_rovim_vmware
+ # coverage combine .coverage_ng_ro .coverage_ro_plugin .coverage_rosdn_arista_cloudvision .coverage_rosdn_dpb .coverage_rosdn_dynpac .coverage_rosdn_floodlightof .coverage_rosdn_ietfl2vpn .coverage_rosdn_juniper_contrail .coverage_rosdn_odlof .coverage_rosdn_onos_vpls .coverage_rosdn_onosof .coverage_rovim_aws .coverage_rovim_azure .coverage_rovim_openvim .coverage_rovim_gcp # .coverage_rovim_openstack .coverage_rovim_vmware
+ coverage combine .coverage_ng_ro .coverage_rovim_openstack
coverage report --omit='*tests*'
coverage html -d ./cover --omit='*tests*'
coverage xml -o coverage.xml --omit='*tests*'
coverage report --omit='*tests*'
coverage html -d ./cover --omit='*tests*'
coverage xml -o coverage.xml --omit='*tests*'
@@
-199,15
+202,19
@@
commands =
#######################################################################################
[testenv:pip-compile]
#######################################################################################
[testenv:pip-compile]
-deps = pip-tools==
5.5
.0
+deps = pip-tools==
6.4
.0
skip_install = true
skip_install = true
-whitelist_externals = sh
+whitelist_externals = bash
+ [
commands =
commands =
- - sh -c "for file in requirements*.in ; do pip-compile -rU --no-header $file ;\
+ - bash -c "for file in requirements*.in ; do \
+ UNSAFE="" ; \
+ if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \
+ pip-compile -rU --no-header $UNSAFE $file ;\
out=`echo $file | sed 's/.in/.txt/'` ; \
sed -i -e '1 e head -16 tox.ini' $out ;\
done"
out=`echo $file | sed 's/.in/.txt/'` ; \
sed -i -e '1 e head -16 tox.ini' $out ;\
done"
- - sh -c "sed -i 's/.*RO-plugin/-e RO-plugin/g' requirements-test.txt"
+ -
ba
sh -c "sed -i 's/.*RO-plugin/-e RO-plugin/g' requirements-test.txt"
#######################################################################################
#######################################################################################