X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=tox.ini;fp=tox.ini;h=dd4b1e6ddb2b516f06690a24c28441aa31e4c19e;hp=c13bc92c79224ca680e789d8144ca6e999eeae80;hb=08c81cf0d426c695e67942ec9dceeeb4458ba582;hpb=0ee9fdb5561e12852cc93a6b13ed237cee039e07

diff --git a/tox.ini b/tox.ini
index c13bc92c..dd4b1e6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,7 +56,6 @@ commands =
         black --check --diff RO-SDN-onos_vpls
         black --check --diff RO-VIM-aws
         black --check --diff RO-VIM-azure
-        black --check --diff RO-VIM-fos
         black --check --diff RO-VIM-openstack
         black --check --diff RO-VIM-openvim
         black --check --diff RO-VIM-vmware
@@ -113,9 +112,6 @@ commands =
         # 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'
-        # RO-VIM-fos
-        nose2 -C --coverage RO-VIM-fos/osm_rovim_fos -s RO-VIM-fos/osm_rovim_fos
-        sh -c 'mv .coverage .coverage_rovim_fos'
         # 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'
@@ -129,7 +125,7 @@ commands =
         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
-        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_fos .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 report --omit='*tests*'
         coverage html -d ./cover --omit='*tests*'
         coverage xml -o coverage.xml --omit='*tests*'
@@ -153,7 +149,6 @@ commands =
         - flake8 RO-SDN-onos_vpls/osm_rosdn_onos_vpls/ RO-SDN-onos_vpls/setup.py
         - flake8 RO-VIM-aws/osm_rovim_aws/ RO-VIM-aws/setup.py
         - flake8 RO-VIM-azure/osm_rovim_azure/ RO-VIM-azure/setup.py
-        - flake8 RO-VIM-fos/osm_rovim_fos/ RO-VIM-fos/setup.py
         - flake8 RO-VIM-openstack/osm_rovim_openstack/ RO-VIM-openstack/setup.py
         - flake8 RO-VIM-openvim/osm_rovim_openvim/ RO-VIM-openvim/setup.py
         - flake8 RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py RO-VIM-vmware/setup.py
@@ -182,7 +177,6 @@ commands =
         - pylint -E RO-SDN-onos_vpls/osm_rosdn_onos_vpls
         - pylint -E RO-VIM-aws/osm_rovim_aws
         - pylint -E RO-VIM-azure/osm_rovim_azure
-        - pylint -E RO-VIM-fos/osm_rovim_fos
         - pylint -E RO-VIM-openstack/osm_rovim_openstack
         - pylint -E RO-VIM-openvim/osm_rovim_openvim
         - pylint -E RO-VIM-vmware/osm_rovim_vmware
@@ -211,6 +205,7 @@ commands =
         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"
 
 
 #######################################################################################
@@ -383,19 +378,6 @@ commands =
         sh -c 'cd deb_dist/osm-rovim-azure*/ && dpkg-buildpackage -rfakeroot -uc -us'
 
 
-#######################################################################################
-[testenv:dist_ro_vim_fos]
-deps =  {[testenv]deps}
-        -r{toxinidir}/requirements-dist.txt
-skip_install = true
-whitelist_externals = sh
-changedir = {toxinidir}/RO-VIM-fos
-commands =
-        sh -c 'rm -rf deb_dist dist osm_rovim_fos.egg-info osm_rovim_fos*.tar.gz'
-        python3 setup.py --command-packages=stdeb.command sdist_dsc
-        sh -c 'cd deb_dist/osm-rovim-fos*/ && dpkg-buildpackage -rfakeroot -uc -us'
-
-
 #######################################################################################
 [testenv:dist_ro_vim_openstack]
 deps =  {[testenv]deps}