diff --git a/fuelweb_test/helpers/ssl_helpers.py b/fuelweb_test/helpers/ssl_helpers.py index 1153aba3a..6cfb50b01 100644 --- a/fuelweb_test/helpers/ssl_helpers.py +++ b/fuelweb_test/helpers/ssl_helpers.py @@ -32,7 +32,7 @@ def generate_user_own_cert(cn, path_to_cert=PATH_TO_CERT, k = crypto.PKey() k.generate_key(crypto.TYPE_RSA, 2048) cert = crypto.X509() - cert.get_subject().OU = 'Mirantis Fuel-QA Team' + cert.get_subject().OU = 'Fuel-QA Team' cert.get_subject().CN = cn cert.set_serial_number(1000) cert.gmtime_adj_notBefore(0) diff --git a/fuelweb_test/models/environment.py b/fuelweb_test/models/environment.py index fcd704f0e..93ca8354f 100644 --- a/fuelweb_test/models/environment.py +++ b/fuelweb_test/models/environment.py @@ -455,13 +455,14 @@ class EnvironmentModel(object): self.admin_install_updates() if settings.MULTIPLE_NETWORKS: self.describe_other_admin_interfaces(admin) - self.nailgun_actions.set_collector_address( - settings.FUEL_STATS_HOST, - settings.FUEL_STATS_PORT, - settings.FUEL_STATS_SSL) - # Restart statsenderd to apply settings(Collector address) - self.nailgun_actions.force_fuel_stats_sending() - if settings.FUEL_STATS_ENABLED: + if settings.FUEL_STATS_HOST: + self.nailgun_actions.set_collector_address( + settings.FUEL_STATS_HOST, + settings.FUEL_STATS_PORT, + settings.FUEL_STATS_SSL) + # Restart statsenderd to apply settings(Collector address) + self.nailgun_actions.force_fuel_stats_sending() + if settings.FUEL_STATS_ENABLED and settings.FUEL_STATS_HOST: self.fuel_web.client.send_fuel_stats(enabled=True) logger.info('Enabled sending of statistics to {0}:{1}'.format( settings.FUEL_STATS_HOST, settings.FUEL_STATS_PORT diff --git a/fuelweb_test/settings.py b/fuelweb_test/settings.py index 2c2f31461..6688b1fd4 100644 --- a/fuelweb_test/settings.py +++ b/fuelweb_test/settings.py @@ -456,12 +456,10 @@ SEPARATE_SERVICE_HORIZON_PLUGIN_PATH = os.environ.get( FUEL_STATS_CHECK = get_var_as_bool('FUEL_STATS_CHECK', False) FUEL_STATS_ENABLED = get_var_as_bool('FUEL_STATS_ENABLED', True) FUEL_STATS_SSL = get_var_as_bool('FUEL_STATS_SSL', False) -FUEL_STATS_HOST = os.environ.get('FUEL_STATS_HOST', - 'fuel-collect-systest.infra.mirantis.net') +FUEL_STATS_HOST = os.environ.get('FUEL_STATS_HOST') FUEL_STATS_PORT = os.environ.get('FUEL_STATS_PORT', '80') -ANALYTICS_IP = os.environ.get('ANALYTICS_IP', - 'fuel-stats-systest.infra.mirantis.net') +ANALYTICS_IP = os.environ.get('ANALYTICS_IP') CUSTOM_ENV = get_var_as_bool('CUSTOM_ENV', False) SECURITY_TEST = get_var_as_bool('SECURITY_TEST', False) @@ -492,10 +490,7 @@ FUEL_PLUGIN_BUILDER_REPO = 'https://github.com/openstack/fuel-plugins.git' # Change various Fuel master node default settings # ############################################################################### -# URL to custom mirror with new OSCI packages which should be tested, -# for example: -# CentOS: http://osci-obs.vm.mirantis.net:82/centos-fuel-master-20921/centos/ -# Ubuntu: http://osci-obs.vm.mirantis.net:82/ubuntu-fuel-master-20921/ubuntu/ +# URL to custom mirror with new OSCI packages which should be tested CUSTOM_PKGS_MIRROR = os.environ.get('CUSTOM_PKGS_MIRROR', '') # URL for Fuel proposed repository - required for correct ordering of upgrade: @@ -639,9 +634,7 @@ RH_ACTIVATION_KEY = os.environ.get("RH_ACTIVATION_KEY") RH_RELEASE = os.environ.get("RH_RELEASE") RH_MAJOR_RELEASE = os.environ.get("RH_MAJOR_RELEASE", "7") CENTOS_DUMMY_DEPLOY = get_var_as_bool("CENTOS_DUMMY_DEPLOY", False) -PERESTROIKA_REPO = os.environ.get( - "PERESTROIKA_REPO", "http://perestroika-repo-tst.infra.mirantis.net/" - "mos-repos/centos/mos8.0-centos7-fuel/os/x86_64/") +PERESTROIKA_REPO = os.environ.get("PERESTROIKA_REPO") RH_POOL_HASH = os.environ.get("RH_POOL_HASH") # Ironic variables diff --git a/fuelweb_test/testrail/settings.py b/fuelweb_test/testrail/settings.py index 98608e938..0644e43ff 100644 --- a/fuelweb_test/testrail/settings.py +++ b/fuelweb_test/testrail/settings.py @@ -54,10 +54,10 @@ class LaunchpadSettings(object): class TestRailSettings(object): """TestRailSettings.""" # TODO documentation - url = os.environ.get('TESTRAIL_URL', 'https://mirantis.testrail.com') + url = os.environ.get('TESTRAIL_URL') user = os.environ.get('TESTRAIL_USER', 'user@example.com') password = os.environ.get('TESTRAIL_PASSWORD', 'password') - project = os.environ.get('TESTRAIL_PROJECT', 'Mirantis OpenStack') + project = os.environ.get('TESTRAIL_PROJECT', 'Fuel') milestone = os.environ.get('TESTRAIL_MILESTONE', '9.0') tests_suite = os.environ.get('TESTRAIL_TEST_SUITE', '[{0}] Swarm'.format(milestone)) diff --git a/fuelweb_test/tests/plugins/plugin_vip_reservation/metadata.yaml b/fuelweb_test/tests/plugins/plugin_vip_reservation/metadata.yaml index b08335bfb..0d7f693e2 100644 --- a/fuelweb_test/tests/plugins/plugin_vip_reservation/metadata.yaml +++ b/fuelweb_test/tests/plugins/plugin_vip_reservation/metadata.yaml @@ -4,7 +4,7 @@ version: '3.0.0' description: Build plugin for test vip_reservation_plugin fuel_version: ['9.0'] licenses: ['Apache License Version 2.0'] -authors: ['Mirantis'] +authors: ['Fuel'] homepage: 'https://github.com/openstack/fuel-plugins' groups: [] releases: diff --git a/system_test/tests_templates/tests_configs/simple/pairwise/1ctrl_1comp_1cndr_mongo_2ceph_neutronVLAN_CephImgRados_ceilometer.yaml b/system_test/tests_templates/tests_configs/simple/pairwise/1ctrl_1comp_1cndr_mongo_2ceph_neutronVLAN_CephImgRados_ceilometer.yaml index 82ba8b09b..915aefab1 100644 --- a/system_test/tests_templates/tests_configs/simple/pairwise/1ctrl_1comp_1cndr_mongo_2ceph_neutronVLAN_CephImgRados_ceilometer.yaml +++ b/system_test/tests_templates/tests_configs/simple/pairwise/1ctrl_1comp_1cndr_mongo_2ceph_neutronVLAN_CephImgRados_ceilometer.yaml @@ -1,7 +1,7 @@ --- template: name: 1 Controller, 1 Compute, 1 Cinder and Mongo, 2 Ceph on Neutron/VLAN use Ceph Image and Rados with Ceilometer - testrail: https://mirantis.testrail.com/index.php?/cases/view/375025 + testrail: cases/view/375025 slaves: 5 cluster_template: name: SimpleCinderMongoCephImgRadosCeiloNeutronVLAN