diff -Nru ceilometer-8.1.1/AUTHORS ceilometer-8.1.2/AUTHORS --- ceilometer-8.1.1/AUTHORS 2017-09-12 16:32:14.000000000 +0000 +++ ceilometer-8.1.2/AUTHORS 2017-11-15 19:02:14.000000000 +0000 @@ -12,6 +12,7 @@ Amy Fong Ana Malagon Ananya Chatterjee +Andrea Frittoli Andreas Jaeger Andreas Jaeger Andrew Hutchings @@ -116,6 +117,7 @@ Ionuț Arțăriși Jake Liu James E. Blair +James E. Blair Jason Myers Jason Zhang Jay Lau @@ -289,6 +291,7 @@ Xia Linjuan XiaBing Yao Xiang Li +Yaguang Tang Yaguang Tang Yanyan Hu Yarko Tymciurak @@ -307,6 +310,7 @@ ZhiQiang Fan Zhongyue Luo Zi Lian Ji +Zuul aggaatul ananya23d annegentle @@ -379,11 +383,13 @@ xiangjun li xiangjun.li xiaozhuangqing +xiexianbin xingzhou yanheven yuyafei zhang-jinnan zhang-shaoman +zhangdaolong zhangguoqing zhangshengping2012 zhangyanxian diff -Nru ceilometer-8.1.1/ceilometer/compute/virt/libvirt/inspector.py ceilometer-8.1.2/ceilometer/compute/virt/libvirt/inspector.py --- ceilometer-8.1.1/ceilometer/compute/virt/libvirt/inspector.py 2017-09-12 16:29:50.000000000 +0000 +++ ceilometer-8.1.2/ceilometer/compute/virt/libvirt/inspector.py 2017-11-15 18:58:37.000000000 +0000 @@ -27,7 +27,7 @@ from ceilometer.compute.pollsters import util from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.compute.virt.libvirt import utils as libvirt_utils -from ceilometer.i18n import _LW, _LE, _ +from ceilometer.i18n import _LE, _ LOG = logging.getLogger(__name__) @@ -181,7 +181,8 @@ for device in filter( bool, [target.get("dev") - for target in tree.findall('devices/disk/target')]): + for target in tree.findall('devices/disk/target') + if target.getparent().find('source') is not None]): disk = virt_inspector.Disk(device=device) block_stats = domain.blockStats(device) stats = virt_inspector.DiskStats(read_requests=block_stats[0], @@ -223,28 +224,20 @@ domain = self._get_domain_not_shut_off_or_raise(instance) tree = etree.fromstring(domain.XMLDesc(0)) for disk in tree.findall('devices/disk'): - disk_type = disk.get('type') - if disk_type: - if disk_type == 'network': - LOG.warning( - _LW('Inspection disk usage of network disk ' - '%(instance_uuid)s unsupported by libvirt') % { - 'instance_uuid': instance.id}) - continue - # NOTE(lhx): "cdrom" device associated to the configdrive - # no longer has a "source" element. Releated bug: - # https://bugs.launchpad.net/ceilometer/+bug/1622718 - if disk.find('source') is None: - continue - target = disk.find('target') - device = target.get('dev') - if device: - dsk = virt_inspector.Disk(device=device) - block_info = domain.blockInfo(device) - info = virt_inspector.DiskInfo(capacity=block_info[0], - allocation=block_info[1], - physical=block_info[2]) - yield (dsk, info) + # NOTE(lhx): "cdrom" device associated to the configdrive + # no longer has a "source" element. Releated bug: + # https://bugs.launchpad.net/ceilometer/+bug/1622718 + if disk.find('source') is None: + continue + target = disk.find('target') + device = target.get('dev') + if device: + dsk = virt_inspector.Disk(device=device) + block_info = domain.blockInfo(device) + info = virt_inspector.DiskInfo(capacity=block_info[0], + allocation=block_info[1], + physical=block_info[2]) + yield (dsk, info) def inspect_memory_resident(self, instance, duration=None): domain = self._get_domain_not_shut_off_or_raise(instance) diff -Nru ceilometer-8.1.1/ceilometer/compute/virt/vmware/inspector.py ceilometer-8.1.2/ceilometer/compute/virt/vmware/inspector.py --- ceilometer-8.1.1/ceilometer/compute/virt/vmware/inspector.py 2017-09-12 16:29:50.000000000 +0000 +++ ceilometer-8.1.2/ceilometer/compute/virt/vmware/inspector.py 2017-11-15 18:58:37.000000000 +0000 @@ -79,7 +79,7 @@ global vmware_api if vmware_api is None: vmware_api = __import__('oslo_vmware.api') - api_session = vmware_api.VMwareAPISession( + api_session = vmware_api.api.VMwareAPISession( conf.vmware.host_ip, conf.vmware.host_username, conf.vmware.host_password, diff -Nru ceilometer-8.1.1/ceilometer/tests/tempest/service/client.py ceilometer-8.1.2/ceilometer/tests/tempest/service/client.py --- ceilometer-8.1.1/ceilometer/tests/tempest/service/client.py 2017-09-12 16:29:49.000000000 +0000 +++ ceilometer-8.1.2/ceilometer/tests/tempest/service/client.py 2017-11-15 18:58:37.000000000 +0000 @@ -16,16 +16,9 @@ from oslo_serialization import jsonutils as json from six.moves.urllib import parse as urllib +from tempest import clients from tempest import config from tempest.lib.common import rest_client -from tempest.lib.services.compute import flavors_client as flavor_cli -from tempest.lib.services.compute import floating_ips_client as floatingip_cli -from tempest.lib.services.compute import networks_client as network_cli -from tempest.lib.services.compute import servers_client as server_cli -from tempest.lib.services.image.v2 import images_client as img_cli_v2 -from tempest import manager -from tempest.services.object_storage import container_client as container_cli -from tempest.services.object_storage import object_client as obj_cli CONF = config.CONF @@ -89,43 +82,9 @@ return rest_client.ResponseBody(resp, body) -class Manager(manager.Manager): +class Manager(clients.Manager): - load_clients = [ - 'servers_client', - 'compute_networks_client', - 'compute_floating_ips_client', - 'flavors_client', - 'image_client_v2', - 'telemetry_client', - 'container_client', - 'object_client', - ] - - default_params = { - 'disable_ssl_certificate_validation': - CONF.identity.disable_ssl_certificate_validation, - 'ca_certs': CONF.identity.ca_certificates_file, - 'trace_requests': CONF.debug.trace_requests - } - - compute_params = { - 'service': CONF.compute.catalog_type, - 'region': CONF.compute.region or CONF.identity.region, - 'endpoint_type': CONF.compute.endpoint_type, - 'build_interval': CONF.compute.build_interval, - 'build_timeout': CONF.compute.build_timeout, - } - compute_params.update(default_params) - - image_params = { - 'service': CONF.image.catalog_type, - 'region': CONF.image.region or CONF.identity.region, - 'endpoint_type': CONF.image.endpoint_type, - 'build_interval': CONF.image.build_interval, - 'build_timeout': CONF.image.build_timeout, - } - image_params.update(default_params) + default_params = config.service_client_config() telemetry_params = { 'service': CONF.telemetry.catalog_type, @@ -134,53 +93,18 @@ } telemetry_params.update(default_params) - object_storage_params = { - 'service': CONF.object_storage.catalog_type, - 'region': CONF.object_storage.region or CONF.identity.region, - 'endpoint_type': CONF.object_storage.endpoint_type - } - object_storage_params.update(default_params) - - def __init__(self, credentials=None, service=None): - super(Manager, self).__init__(credentials) - for client in self.load_clients: - getattr(self, 'set_%s' % client)() - - def set_servers_client(self): - self.servers_client = server_cli.ServersClient( - self.auth_provider, - **self.compute_params) - - def set_compute_networks_client(self): - self.compute_networks_client = network_cli.NetworksClient( - self.auth_provider, - **self.compute_params) - - def set_compute_floating_ips_client(self): - self.compute_floating_ips_client = floatingip_cli.FloatingIPsClient( - self.auth_provider, - **self.compute_params) - - def set_flavors_client(self): - self.flavors_client = flavor_cli.FlavorsClient( - self.auth_provider, - **self.compute_params) - - def set_image_client_v2(self): - self.image_client_v2 = img_cli_v2.ImagesClient( - self.auth_provider, - **self.image_params) + def __init__(self, credentials): + # TODO(andreaf) Overriding Manager is a workaround. The "proper" way + # would it to expose the ceilometer service client via the plugin + # interface, use tempest.lib.clients and tempest master. + # Then ceilometer service client would be loaded and configured + # automatically into ServiceClients. + # In any case we're about to declare clients.Manager a stable + # interface for plugins and we won't change it, so this code won't + # break. + super(Manager, self).__init__(credentials=credentials) + self.set_telemetry_client() def set_telemetry_client(self): self.telemetry_client = TelemetryClient(self.auth_provider, **self.telemetry_params) - - def set_container_client(self): - self.container_client = container_cli.ContainerClient( - self.auth_provider, - **self.object_storage_params) - - def set_object_client(self): - self.object_client = obj_cli.ObjectClient( - self.auth_provider, - **self.object_storage_params) diff -Nru ceilometer-8.1.1/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py ceilometer-8.1.2/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py --- ceilometer-8.1.1/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py 2017-09-12 16:29:51.000000000 +0000 +++ ceilometer-8.1.2/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py 2017-11-15 18:58:37.000000000 +0000 @@ -388,7 +388,7 @@ 2, 999999))) disks = list(self.inspector.inspect_disk_info(self.instance)) - self.assertEqual(0, len(disks)) + self.assertEqual(1, len(disks)) def test_inspect_disk_info_without_source_element(self): dom_xml = """ @@ -423,6 +423,44 @@ self.assertEqual(0, len(disks)) + def test_inspect_disks_without_source_element(self): + dom_xml = """ + + + + + + + + +
+ + + + """ + blockStatsFlags = {'wr_total_times': 91752302267, + 'rd_operations': 6756, + 'flush_total_times': 1310427331, + 'rd_total_times': 29142253616, + 'rd_bytes': 171460096, + 'flush_operations': 746, + 'wr_operations': 1437, + 'wr_bytes': 13574656} + domain = mock.Mock() + domain.XMLDesc.return_value = dom_xml + domain.info.return_value = (0, 0, 0, 2, 999999) + domain.blockStats.return_value = (1, 2, 3, 4, -1) + domain.blockStatsFlags.return_value = blockStatsFlags + conn = mock.Mock() + conn.lookupByUUIDString.return_value = domain + + with mock.patch('ceilometer.compute.virt.libvirt.utils.' + 'get_libvirt_connection', return_value=conn): + disks = list(self.inspector.inspect_disks(self.instance)) + + self.assertEqual(0, len(disks)) + def test_inspect_memory_usage_with_domain_shutoff(self): connection = self.inspector.connection with mock.patch.object(connection, 'lookupByUUIDString', diff -Nru ceilometer-8.1.1/ceilometer/tests/unit/pipeline_base.py ceilometer-8.1.2/ceilometer/tests/unit/pipeline_base.py --- ceilometer-8.1.1/ceilometer/tests/unit/pipeline_base.py 2017-09-12 16:29:51.000000000 +0000 +++ ceilometer-8.1.2/ceilometer/tests/unit/pipeline_base.py 2017-11-15 18:58:37.000000000 +0000 @@ -1157,7 +1157,7 @@ self.assertEqual(1, len(publisher.samples)) cpu_util_sample = publisher.samples[0] - self.assertEqual(100, cpu_util_sample.volume) + self.assertAlmostEqual(100.0, cpu_util_sample.volume) def test_rate_of_change_max(self): s = "100.0 / (10**9 * (resource_metadata.cpu_number or 1))" @@ -1215,7 +1215,7 @@ self.assertEqual(1, len(publisher.samples)) cpu_util_sample = publisher.samples[0] - self.assertEqual(100, cpu_util_sample.volume) + self.assertAlmostEqual(100.0, cpu_util_sample.volume) @mock.patch('ceilometer.transformer.conversions.LOG') def test_rate_of_change_out_of_order(self, the_log): @@ -1286,7 +1286,7 @@ self.assertEqual(1, len(publisher.samples)) cpu_util_sample = publisher.samples[0] - self.assertEqual(12.5, cpu_util_sample.volume) + self.assertAlmostEqual(12.5, cpu_util_sample.volume) the_log.warning.assert_called_with( 'dropping out of time order sample: %s', (counters[1],) diff -Nru ceilometer-8.1.1/ceilometer.egg-info/pbr.json ceilometer-8.1.2/ceilometer.egg-info/pbr.json --- ceilometer-8.1.1/ceilometer.egg-info/pbr.json 2017-09-12 16:32:14.000000000 +0000 +++ ceilometer-8.1.2/ceilometer.egg-info/pbr.json 2017-11-15 19:02:14.000000000 +0000 @@ -1 +1 @@ -{"git_version": "d930f08", "is_release": true} \ No newline at end of file +{"git_version": "b372552", "is_release": true} \ No newline at end of file diff -Nru ceilometer-8.1.1/ceilometer.egg-info/PKG-INFO ceilometer-8.1.2/ceilometer.egg-info/PKG-INFO --- ceilometer-8.1.1/ceilometer.egg-info/PKG-INFO 2017-09-12 16:32:14.000000000 +0000 +++ ceilometer-8.1.2/ceilometer.egg-info/PKG-INFO 2017-11-15 19:02:14.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ceilometer -Version: 8.1.1 +Version: 8.1.2 Summary: OpenStack Telemetry Home-page: http://docs.openstack.org/developer/ceilometer/ Author: OpenStack diff -Nru ceilometer-8.1.1/ceilometer.egg-info/SOURCES.txt ceilometer-8.1.2/ceilometer.egg-info/SOURCES.txt --- ceilometer-8.1.1/ceilometer.egg-info/SOURCES.txt 2017-09-12 16:32:16.000000000 +0000 +++ ceilometer-8.1.2/ceilometer.egg-info/SOURCES.txt 2017-11-15 19:02:15.000000000 +0000 @@ -1,6 +1,7 @@ .coveragerc .mailmap .testr.conf +.zuul.yaml AUTHORS CONTRIBUTING.rst ChangeLog @@ -589,6 +590,22 @@ install-guide/source/swift/install-swift-prereq-common.inc install-guide/source/swift/install-swift-rdo.rst install-guide/source/swift/install-swift-ubuntu.rst +playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/post.yaml +playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/run.yaml +playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/post.yaml +playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/run.yaml +playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/post.yaml +playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/run.yaml +playbooks/legacy/ceilometer-tox-py27-mongodb/post.yaml +playbooks/legacy/ceilometer-tox-py27-mongodb/run.yaml +playbooks/legacy/ceilometer-tox-py27-mysql/post.yaml +playbooks/legacy/ceilometer-tox-py27-mysql/run.yaml +playbooks/legacy/ceilometer-tox-py27-postgresql/post.yaml +playbooks/legacy/ceilometer-tox-py27-postgresql/run.yaml +playbooks/legacy/grenade-dsvm-ceilometer/post.yaml +playbooks/legacy/grenade-dsvm-ceilometer/run.yaml +playbooks/legacy/telemetry-dsvm-integration-ceilometer/post.yaml +playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml rally-jobs/README.rst rally-jobs/ceilometer.yaml rally-jobs/extra/README.rst diff -Nru ceilometer-8.1.1/ChangeLog ceilometer-8.1.2/ChangeLog --- ceilometer-8.1.1/ChangeLog 2017-09-12 16:32:14.000000000 +0000 +++ ceilometer-8.1.2/ChangeLog 2017-11-15 19:02:14.000000000 +0000 @@ -1,6 +1,22 @@ CHANGES ======= +8.1.2 +----- + +* telemetry doesn't follow requirements +* Fix bug for ceilometer polling generates an exception +* set ceilometer\_backend +* Zuul: add file extension to playbook path +* remove branch matching +* Remove the wrap for skip inspect rbd disk info +* devstack: install Gnocchi using pip +* devstack: install ceilometer extra +* Use tempest.clients.Manager as base clients class +* Move object storage container\_client to match tempest +* fix cpu\_util precision is too precise +* Fix can not find VMwareAPISession when import oslo\_vmware + 8.1.1 ----- diff -Nru ceilometer-8.1.1/debian/changelog ceilometer-8.1.2/debian/changelog --- ceilometer-8.1.1/debian/changelog 2017-09-21 17:23:17.000000000 +0000 +++ ceilometer-8.1.2/debian/changelog 2017-12-04 15:05:21.000000000 +0000 @@ -1,3 +1,9 @@ +ceilometer (1:8.1.2-0ubuntu1) zesty; urgency=medium + + * New stable point release for OpenStack Ocata (LP: #1736149). + + -- Corey Bryant Mon, 04 Dec 2017 10:05:21 -0500 + ceilometer (1:8.1.1-0ubuntu1) zesty; urgency=medium * New upstream version. diff -Nru ceilometer-8.1.1/devstack/plugin.sh ceilometer-8.1.2/devstack/plugin.sh --- ceilometer-8.1.1/devstack/plugin.sh 2017-09-12 16:29:51.000000000 +0000 +++ ceilometer-8.1.2/devstack/plugin.sh 2017-11-15 18:58:37.000000000 +0000 @@ -62,6 +62,10 @@ } +function gnocchi_service_url { + echo "$GNOCCHI_SERVICE_PROTOCOL://$GNOCCHI_SERVICE_HOST:$GNOCCHI_SERVICE_PORT" +} + # _ceilometer_install_mongdb - Install mongodb and python lib. function _ceilometer_install_mongodb { # Server package is the same on all @@ -127,7 +131,7 @@ function _ceilometer_prepare_coordination { if echo $CEILOMETER_COORDINATION_URL | grep -q '^memcached:'; then install_package memcached - elif [[ "${CEILOMETER_COORDINATOR_URL%%:*}" == "redis" || "${CEILOMETER_CACHE_BACKEND##*.}" == "redis" ]]; then + elif [[ "${CEILOMETER_COORDINATOR_URL%%:*}" == "redis" || "${CEILOMETER_CACHE_BACKEND##*.}" == "redis" || "${CEILOMETER_BACKEND}" == "gnocchi" ]]; then _ceilometer_install_redis fi } @@ -179,9 +183,82 @@ get_or_add_user_project_role "ResellerAdmin" "ceilometer" $SERVICE_PROJECT_NAME fi + if [ "$CEILOMETER_BACKEND" == "gnocchi" ]; then + create_service_user "gnocchi" + local gnocchi_service=$(get_or_create_service "gnocchi" \ + "metric" "OpenStack Metric Service") + get_or_create_endpoint $gnocchi_service \ + "$REGION_NAME" \ + "$(gnocchi_service_url)" \ + "$(gnocchi_service_url)" \ + "$(gnocchi_service_url)" + fi export OS_CLOUD=$OLD_OS_CLOUD } + +function install_gnocchi { + echo_summary "Installing Gnocchi" + if python3_enabled; then + PY_VERS=${PYTHON3_VERSION} + else + PY_VERS=${PYTHON2_VERSION} + fi + # workaround for upper-constraints. pandas is uncapped but and numpy is. + sudo -H python${PY_VERS} -m pip install -U "gnocchi[file,${DATABASE_TYPE},keystone]>=3.1,<4.0" + recreate_database gnocchi + sudo install -d -o $STACK_USER -m 755 $GNOCCHI_CONF_DIR + + [ ! -d $GNOCCHI_DATA_DIR ] && sudo mkdir -m 755 -p $GNOCCHI_DATA_DIR + sudo chown $STACK_USER $GNOCCHI_DATA_DIR + + if [ -n "$GNOCCHI_COORDINATOR_URL" ]; then + iniset $GNOCCHI_CONF storage coordination_url "$GNOCCHI_COORDINATOR_URL" + fi + iniset $GNOCCHI_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL" + iniset $GNOCCHI_CONF indexer url `database_connection_url gnocchi` + iniset $GNOCCHI_CONF storage driver file + iniset $GNOCCHI_CONF storage file_basepath $GNOCCHI_DATA_DIR/ + iniset $GNOCCHI_CONF metricd metric_processing_delay "$GNOCCHI_METRICD_PROCESSING_DELAY" + + iniset $GNOCCHI_CONF api auth_mode keystone + configure_auth_token_middleware $GNOCCHI_CONF gnocchi $GNOCCHI_AUTH_CACHE_DIR + + sudo mkdir -p $GNOCCHI_AUTH_CACHE_DIR + sudo chown $STACK_USER $GNOCCHI_AUTH_CACHE_DIR + rm -f $GNOCCHI_AUTH_CACHE_DIR/* + + gnocchi-upgrade --create-legacy-resource-types + + # cleanup + sudo rm -f $GNOCCHI_WSGI_DIR/*.wsgi + sudo rm -f $(apache_site_config_for gnocchi) + + sudo mkdir -p $GNOCCHI_WSGI_DIR + + local gnocchi_apache_conf=$(apache_site_config_for gnocchi) + local venv_path="" + local script_name=$GNOCCHI_SERVICE_PREFIX + + echo "from gnocchi.rest import app" | sudo tee -a $GNOCCHI_WSGI_DIR/app + echo "application = app.build_wsgi_app()" | sudo tee -a $GNOCCHI_WSGI_DIR/app + + sudo cp $CEILOMETER_DIR/devstack/apache-ceilometer.template $gnocchi_apache_conf + sudo sed -e " + s|ceilometer-api|gnocchi|g; + s|ceilometer|gnocchi|g; + s|%PORT%|$GNOCCHI_SERVICE_PORT|g; + s|%APACHE_NAME%|$APACHE_NAME|g; + s|%WSGIAPP%|$GNOCCHI_WSGI_DIR/app|g; + s|%USER%|$STACK_USER|g; + s|%VIRTUALENV%|$venv_path|g + " -i $gnocchi_apache_conf + + if [ -n "$GNOCCHI_COORDINATOR_URL" ]; then + iniset $GNOCCHI_CONF storage coordination_url "$GNOCCHI_COORDINATOR_URL" + fi +} + # Activities to do before ceilometer has been installed. function preinstall_ceilometer { echo_summary "Preinstall not in virtualenv context. Skipping." @@ -364,11 +441,6 @@ $CEILOMETER_BIN_DIR/ceilometer-upgrade --skip-gnocchi-resource-types fi fi - if is_service_enabled gnocchi ; then - if [ "$CEILOMETER_BACKEND" = 'gnocchi' ]; then - $CEILOMETER_BIN_DIR/ceilometer-upgrade --skip-metering-database - fi - fi fi } @@ -378,10 +450,12 @@ # installed. The context is not active during preinstall (when it would # otherwise makes sense to do the backend services). function install_ceilometer { - if is_service_enabled ceilometer-acentral ceilometer-acompute ceilometer-anotification ; then + if is_service_enabled ceilometer-acentral ceilometer-acompute ceilometer-anotification gnocchi-api gnocchi-metricd; then _ceilometer_prepare_coordination fi + [ "$CEILOMETER_BACKEND" = 'gnocchi' ] && install_gnocchi + if is_service_enabled ceilometer-collector ceilometer-api; then _ceilometer_prepare_storage_backend fi @@ -391,7 +465,14 @@ fi install_ceilometerclient - setup_develop $CEILOMETER_DIR + + case $CEILOMETER_BACKEND in + mongodb) extra=mongo;; + gnocchi) extra=gnocchi;; + mysql) extra=mysql;; + postgresql) extra=postgresql;; + esac + setup_develop $CEILOMETER_DIR $extra sudo install -d -o $STACK_USER -m 755 $CEILOMETER_CONF_DIR } @@ -408,6 +489,21 @@ # start_ceilometer() - Start running processes, including screen function start_ceilometer { + + if [ "$CEILOMETER_BACKEND" = "gnocchi" ] ; then + enable_apache_site gnocchi + restart_apache_server + tail_log gnocchi /var/log/$APACHE_NAME/gnocchi.log + tail_log gnocchi-api /var/log/$APACHE_NAME/gnocchi-access.log + echo "Waiting for gnocchi-api to start..." + if ! timeout $SERVICE_TIMEOUT sh -c "while ! curl -v --max-time 5 --noproxy '*' -s $(gnocchi_service_url)/v1/resource/generic ; do sleep 1; done"; then + die $LINENO "gnocchi-api did not start" + fi + + run_process gnocchi-metricd "/usr/local/bin/gnocchi-metricd --config-file $GNOCCHI_CONF" + $CEILOMETER_BIN_DIR/ceilometer-upgrade --skip-metering-database + fi + run_process ceilometer-acentral "$CEILOMETER_BIN_DIR/ceilometer-polling --polling-namespaces central --config-file $CEILOMETER_CONF" run_process ceilometer-anotification "$CEILOMETER_BIN_DIR/ceilometer-agent-notification --config-file $CEILOMETER_CONF" run_process ceilometer-aipmi "$CEILOMETER_BIN_DIR/ceilometer-polling --polling-namespaces ipmi --config-file $CEILOMETER_CONF" diff -Nru ceilometer-8.1.1/devstack/settings ceilometer-8.1.2/devstack/settings --- ceilometer-8.1.1/devstack/settings 2017-09-12 16:29:51.000000000 +0000 +++ ceilometer-8.1.2/devstack/settings 2017-11-15 18:58:37.000000000 +0000 @@ -17,10 +17,23 @@ CEILOMETER_BACKEND=${CEILOMETER_BACKEND:-none} if [ "$CEILOMETER_BACKEND" = "es" ] || [ "$CEILOMETER_BACKEND" = "mysql" ] || [ "$CEILOMETER_BACKEND" = "postgresql" ] || [ "$CEILOMETER_BACKEND" = "mongodb" ]; then enable_service ceilometer-api +elif [ "$CEILOMETER_BACKEND" = "gnocchi" ]; then + enable_service gnocchi-api gnocchi-metricd fi # Gnocchi default archive_policy for Ceilometer GNOCCHI_ARCHIVE_POLICY=${GNOCCHI_ARCHIVE_POLICY:-low} +GNOCCHI_CONF_DIR=${GNOCCHI_CONF_DIR:-/etc/gnocchi} +GNOCCHI_CONF=${GNOCCHI_CONF:-${GNOCCHI_CONF_DIR}/gnocchi.conf} +GNOCCHI_COORDINATOR_URL=${CEILOMETER_COORDINATOR_URL:-redis://localhost:6379} +GNOCCHI_METRICD_PROCESSING_DELAY=${GNOCCHI_METRICD_PROCESSING_DELAY:-5} +GNOCCHI_AUTH_CACHE_DIR=${GNOCCHI_AUTH_CACHE_DIR:-/var/cache/gnocchi} +GNOCCHI_DATA_DIR=${GNOCCHI_DATA_DIR:-${DATA_DIR}/gnocchi} + +GNOCCHI_SERVICE_PROTOCOL=http +GNOCCHI_SERVICE_HOST=${GNOCCHI_SERVICE_HOST:-${SERVICE_HOST}} +GNOCCHI_SERVICE_PORT=${GNOCCHI_SERVICE_PORT:-8041} +GNOCCHI_WSGI_DIR=${GNOCCHI_WSGI_DIR:-/var/www/gnocchi} # Ceilometer connection info. CEILOMETER_SERVICE_PROTOCOL=http @@ -55,18 +68,6 @@ local plugins="${DEVSTACK_PLUGINS}" local plugin - if [ "$CEILOMETER_BACKEND" == 'gnocchi' ]; then - local seen_gnocchi=False - - for plugin in ${plugins//,/ }; do - if [ "$plugin" == 'gnocchi' ]; then - seen_gnocchi=True - elif [ "$plugin" == 'ceilometer' ] && [ "$seen_gnocchi" == 'False' ]; then - die $LINENO "gnocchi must be enabled before ceilometer!" - fi - done - fi - local seen_ceilometer=False for plugin in ${plugins//,/ }; do diff -Nru ceilometer-8.1.1/PKG-INFO ceilometer-8.1.2/PKG-INFO --- ceilometer-8.1.1/PKG-INFO 2017-09-12 16:32:16.000000000 +0000 +++ ceilometer-8.1.2/PKG-INFO 2017-11-15 19:02:15.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ceilometer -Version: 8.1.1 +Version: 8.1.2 Summary: OpenStack Telemetry Home-page: http://docs.openstack.org/developer/ceilometer/ Author: OpenStack diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/post.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/post.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/post.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/post.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,80 @@ +- hosts: primary + tasks: + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*nose_results.html + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testr_results.html.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.testrepository/tmp* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testrepository.subunit.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}/tox' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.tox/*/log/* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/logs/** + - --include=*/ + - --exclude=* + - --prune-empty-dirs diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/run.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/run.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/run.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/run.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,52 @@ +- hosts: all + name: Autoconverted job legacy-ceilometer-dsvm-tempest-plugin-mongodb from old job + gate-ceilometer-dsvm-tempest-plugin-mongodb-ubuntu-xenial + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - shell: + cmd: | + set -e + set -x + cat > clonemap.yaml << EOF + clonemap: + - name: openstack-infra/devstack-gate + dest: devstack-gate + EOF + /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ + git://git.openstack.org \ + openstack-infra/devstack-gate + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -e + set -x + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_REGEX="^ceilometer\." + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=mongodb" + + export BRANCH_OVERRIDE=default + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + if [ "mongodb" = "postgresql" ] ; then + export DEVSTACK_GATE_POSTGRES=1 + fi + if [ "" == "-identity-v3-only" ] ; then + export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" + fi + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/post.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/post.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/post.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/post.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,80 @@ +- hosts: primary + tasks: + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*nose_results.html + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testr_results.html.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.testrepository/tmp* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testrepository.subunit.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}/tox' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.tox/*/log/* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/logs/** + - --include=*/ + - --exclude=* + - --prune-empty-dirs diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/run.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/run.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/run.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/run.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,52 @@ +- hosts: all + name: Autoconverted job legacy-ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only + from old job gate-ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only-ubuntu-xenial + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - shell: + cmd: | + set -e + set -x + cat > clonemap.yaml << EOF + clonemap: + - name: openstack-infra/devstack-gate + dest: devstack-gate + EOF + /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ + git://git.openstack.org \ + openstack-infra/devstack-gate + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -e + set -x + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_REGEX="^ceilometer\." + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=mongodb" + + export BRANCH_OVERRIDE=default + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + if [ "mongodb" = "postgresql" ] ; then + export DEVSTACK_GATE_POSTGRES=1 + fi + if [ "-identity-v3-only" == "-identity-v3-only" ] ; then + export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" + fi + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/post.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/post.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/post.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/post.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,80 @@ +- hosts: primary + tasks: + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*nose_results.html + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testr_results.html.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.testrepository/tmp* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testrepository.subunit.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}/tox' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.tox/*/log/* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/logs/** + - --include=*/ + - --exclude=* + - --prune-empty-dirs diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/run.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/run.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/run.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/run.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,53 @@ +- hosts: all + name: Autoconverted job legacy-ceilometer-dsvm-tempest-plugin-mysql from old job + gate-ceilometer-dsvm-tempest-plugin-mysql-ubuntu-xenial + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - shell: + cmd: | + set -e + set -x + cat > clonemap.yaml << EOF + clonemap: + - name: openstack-infra/devstack-gate + dest: devstack-gate + EOF + /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ + git://git.openstack.org \ + openstack-infra/devstack-gate + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -e + set -x + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_REGEX="^ceilometer\." + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_GATE_CEILOMETER_BACKEND=mysql + export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=mysql" + + export BRANCH_OVERRIDE=default + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + if [ "mysql" = "postgresql" ] ; then + export DEVSTACK_GATE_POSTGRES=1 + fi + if [ "" == "-identity-v3-only" ] ; then + export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" + fi + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-mongodb/post.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-mongodb/post.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-mongodb/post.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-mongodb/post.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,67 @@ +- hosts: primary + tasks: + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*nose_results.html + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testr_results.html.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.testrepository/tmp* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testrepository.subunit.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}/tox' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.tox/*/log/* + - --include=*/ + - --exclude=* + - --prune-empty-dirs diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-mongodb/run.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-mongodb/run.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-mongodb/run.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-mongodb/run.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,86 @@ +- hosts: all + name: Autoconverted job legacy-ceilometer-tox-py27-mongodb from old job gate-ceilometer-tox-py27-mongodb-ubuntu-xenial + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - shell: + cmd: | + set -e + set -x + CLONEMAP=`mktemp` + REQS_DIR=`mktemp -d` + function cleanup { + mkdir -p $WORKSPACE + rm -rf $CLONEMAP $REQS_DIR + } + trap cleanup EXIT + cat > $CLONEMAP << EOF + clonemap: + - name: $ZUUL_PROJECT + dest: . + EOF + # zuul cloner works poorly if there are 2 names that are the + # same in here. + if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then + cat >> $CLONEMAP << EOF + - name: openstack/requirements + dest: $REQS_DIR + EOF + fi + /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ + git://git.openstack.org $ZUUL_PROJECT openstack/requirements + # REQS_DIR is not set for openstack/requirements and there is also + # no need to copy in this case. + if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then + cp $REQS_DIR/upper-constraints.txt ./ + fi + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + if [ -x tools/test-setup.sh ] ; then + tools/test-setup.sh + fi + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -x + sudo rm -f /etc/sudoers.d/zuul + # Prove that general sudo access is actually revoked + ! sudo -n true + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: /usr/local/jenkins/slave_scripts/run-tox.sh py27-mongodb + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + OUT=`git ls-files --other --exclude-standard --directory` + if [ -z "$OUT" ]; then + echo "No extra files created during test." + exit 0 + else + echo "The following un-ignored files were created during the test:" + echo "$OUT" + exit 0 # TODO: change to 1 to fail tests. + fi + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-mysql/post.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-mysql/post.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-mysql/post.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-mysql/post.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,67 @@ +- hosts: primary + tasks: + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*nose_results.html + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testr_results.html.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.testrepository/tmp* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testrepository.subunit.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}/tox' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.tox/*/log/* + - --include=*/ + - --exclude=* + - --prune-empty-dirs diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-mysql/run.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-mysql/run.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-mysql/run.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-mysql/run.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,86 @@ +- hosts: all + name: Autoconverted job legacy-ceilometer-tox-py27-mysql from old job gate-ceilometer-tox-py27-mysql-ubuntu-xenial + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - shell: + cmd: | + set -e + set -x + CLONEMAP=`mktemp` + REQS_DIR=`mktemp -d` + function cleanup { + mkdir -p $WORKSPACE + rm -rf $CLONEMAP $REQS_DIR + } + trap cleanup EXIT + cat > $CLONEMAP << EOF + clonemap: + - name: $ZUUL_PROJECT + dest: . + EOF + # zuul cloner works poorly if there are 2 names that are the + # same in here. + if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then + cat >> $CLONEMAP << EOF + - name: openstack/requirements + dest: $REQS_DIR + EOF + fi + /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ + git://git.openstack.org $ZUUL_PROJECT openstack/requirements + # REQS_DIR is not set for openstack/requirements and there is also + # no need to copy in this case. + if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then + cp $REQS_DIR/upper-constraints.txt ./ + fi + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + if [ -x tools/test-setup.sh ] ; then + tools/test-setup.sh + fi + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -x + sudo rm -f /etc/sudoers.d/zuul + # Prove that general sudo access is actually revoked + ! sudo -n true + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: /usr/local/jenkins/slave_scripts/run-tox.sh py27-mysql + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + OUT=`git ls-files --other --exclude-standard --directory` + if [ -z "$OUT" ]; then + echo "No extra files created during test." + exit 0 + else + echo "The following un-ignored files were created during the test:" + echo "$OUT" + exit 0 # TODO: change to 1 to fail tests. + fi + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-postgresql/post.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-postgresql/post.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-postgresql/post.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-postgresql/post.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,67 @@ +- hosts: primary + tasks: + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*nose_results.html + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testr_results.html.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.testrepository/tmp* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testrepository.subunit.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}/tox' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.tox/*/log/* + - --include=*/ + - --exclude=* + - --prune-empty-dirs diff -Nru ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-postgresql/run.yaml ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-postgresql/run.yaml --- ceilometer-8.1.1/playbooks/legacy/ceilometer-tox-py27-postgresql/run.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/ceilometer-tox-py27-postgresql/run.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,86 @@ +- hosts: all + name: Autoconverted job legacy-ceilometer-tox-py27-postgresql from old job gate-ceilometer-tox-py27-postgresql-ubuntu-xenial + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - shell: + cmd: | + set -e + set -x + CLONEMAP=`mktemp` + REQS_DIR=`mktemp -d` + function cleanup { + mkdir -p $WORKSPACE + rm -rf $CLONEMAP $REQS_DIR + } + trap cleanup EXIT + cat > $CLONEMAP << EOF + clonemap: + - name: $ZUUL_PROJECT + dest: . + EOF + # zuul cloner works poorly if there are 2 names that are the + # same in here. + if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then + cat >> $CLONEMAP << EOF + - name: openstack/requirements + dest: $REQS_DIR + EOF + fi + /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ + git://git.openstack.org $ZUUL_PROJECT openstack/requirements + # REQS_DIR is not set for openstack/requirements and there is also + # no need to copy in this case. + if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then + cp $REQS_DIR/upper-constraints.txt ./ + fi + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + if [ -x tools/test-setup.sh ] ; then + tools/test-setup.sh + fi + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -x + sudo rm -f /etc/sudoers.d/zuul + # Prove that general sudo access is actually revoked + ! sudo -n true + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: /usr/local/jenkins/slave_scripts/run-tox.sh py27-postgresql + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + OUT=`git ls-files --other --exclude-standard --directory` + if [ -z "$OUT" ]; then + echo "No extra files created during test." + exit 0 + else + echo "The following un-ignored files were created during the test:" + echo "$OUT" + exit 0 # TODO: change to 1 to fail tests. + fi + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' diff -Nru ceilometer-8.1.1/playbooks/legacy/grenade-dsvm-ceilometer/post.yaml ceilometer-8.1.2/playbooks/legacy/grenade-dsvm-ceilometer/post.yaml --- ceilometer-8.1.1/playbooks/legacy/grenade-dsvm-ceilometer/post.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/grenade-dsvm-ceilometer/post.yaml 2017-11-15 18:58:30.000000000 +0000 @@ -0,0 +1,15 @@ +- hosts: primary + tasks: + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/logs/** + - --include=*/ + - --exclude=* + - --prune-empty-dirs diff -Nru ceilometer-8.1.1/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml ceilometer-8.1.2/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml --- ceilometer-8.1.1/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,45 @@ +- hosts: all + name: Autoconverted job legacy-grenade-dsvm-ceilometer from old job gate-grenade-dsvm-ceilometer-ubuntu-xenial + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - shell: + cmd: | + set -e + set -x + cat > clonemap.yaml << EOF + clonemap: + - name: openstack-infra/devstack-gate + dest: devstack-gate + EOF + /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ + git://git.openstack.org \ + openstack-infra/devstack-gate + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -e + set -x + export PROJECTS="openstack-dev/grenade $PROJECTS" + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_GRENADE=pullup + export BRANCH_OVERRIDE=default + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + export GRENADE_PLUGINRC="enable_grenade_plugin ceilometer https://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=mysql" + + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' diff -Nru ceilometer-8.1.1/playbooks/legacy/telemetry-dsvm-integration-ceilometer/post.yaml ceilometer-8.1.2/playbooks/legacy/telemetry-dsvm-integration-ceilometer/post.yaml --- ceilometer-8.1.1/playbooks/legacy/telemetry-dsvm-integration-ceilometer/post.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/telemetry-dsvm-integration-ceilometer/post.yaml 2017-11-15 18:58:30.000000000 +0000 @@ -0,0 +1,80 @@ +- hosts: primary + tasks: + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*nose_results.html + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testr_results.html.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.testrepository/tmp* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=**/*testrepository.subunit.gz + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}/tox' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/.tox/*/log/* + - --include=*/ + - --exclude=* + - --prune-empty-dirs + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/logs/** + - --include=*/ + - --exclude=* + - --prune-empty-dirs diff -Nru ceilometer-8.1.1/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml ceilometer-8.1.2/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml --- ceilometer-8.1.1/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml 2017-11-15 18:58:30.000000000 +0000 @@ -0,0 +1,56 @@ +- hosts: all + name: Autoconverted job legacy-telemetry-dsvm-integration-ceilometer from old job + gate-telemetry-dsvm-integration-ceilometer-ubuntu-xenial + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - shell: + cmd: | + set -e + set -x + cat > clonemap.yaml << EOF + clonemap: + - name: openstack-infra/devstack-gate + dest: devstack-gate + EOF + /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ + git://git.openstack.org \ + openstack-infra/devstack-gate + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -e + set -x + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_HEAT=1 + export DEVSTACK_GATE_NEUTRON=1 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_EXERCISES=0 + export DEVSTACK_GATE_INSTALL_TESTONLY=1 + export DEVSTACK_GATE_TEMPEST_NOTESTS=1 + export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15" + export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME + function post_test_hook { + cd /opt/stack/new/ceilometer/ceilometer/tests/integration/hooks/ + ./post_test_hook.sh + } + export -f post_test_hook + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' diff -Nru ceilometer-8.1.1/test-requirements.txt ceilometer-8.1.2/test-requirements.txt --- ceilometer-8.1.1/test-requirements.txt 2017-09-12 16:29:51.000000000 +0000 +++ ceilometer-8.1.2/test-requirements.txt 2017-11-15 18:58:37.000000000 +0000 @@ -13,7 +13,7 @@ openstackdocstheme>=1.0.3 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 reno>=1.6.2 # Apache2 -oslotest>=1.10.0 # Apache-2.0 +oslotest>=1.10.0,<3.0.0 # Apache-2.0 oslo.vmware>=1.16.0 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD pyOpenSSL>=0.14 # Apache-2.0 diff -Nru ceilometer-8.1.1/.zuul.yaml ceilometer-8.1.2/.zuul.yaml --- ceilometer-8.1.1/.zuul.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-8.1.2/.zuul.yaml 2017-11-15 18:58:37.000000000 +0000 @@ -0,0 +1,107 @@ +- job: + name: ceilometer-dsvm-tempest-plugin-mongodb + parent: legacy-dsvm-base + run: playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/run.yaml + post-run: playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/post.yaml + timeout: 7800 + required-projects: + - openstack-infra/devstack-gate + - openstack/ceilometer + - openstack/tempest + +- job: + name: ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only + parent: legacy-dsvm-base + run: playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/run.yaml + post-run: playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/post.yaml + timeout: 7800 + required-projects: + - openstack-infra/devstack-gate + - openstack/ceilometer + - openstack/tempest + +- job: + name: ceilometer-dsvm-tempest-plugin-mysql + parent: legacy-dsvm-base + run: playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/run.yaml + post-run: playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/post.yaml + timeout: 7800 + required-projects: + - openstack-infra/devstack-gate + - openstack/ceilometer + - openstack/tempest + +- job: + name: ceilometer-tox-py27-mongodb + parent: legacy-base + run: playbooks/legacy/ceilometer-tox-py27-mongodb/run.yaml + post-run: playbooks/legacy/ceilometer-tox-py27-mongodb/post.yaml + timeout: 2400 + required-projects: + - openstack/requirements + +- job: + name: ceilometer-tox-py27-mysql + parent: legacy-base + run: playbooks/legacy/ceilometer-tox-py27-mysql/run.yaml + post-run: playbooks/legacy/ceilometer-tox-py27-mysql/post.yaml + timeout: 2400 + required-projects: + - openstack/requirements + +- job: + name: ceilometer-tox-py27-postgresql + parent: legacy-base + run: playbooks/legacy/ceilometer-tox-py27-postgresql/run.yaml + post-run: playbooks/legacy/ceilometer-tox-py27-postgresql/post.yaml + timeout: 2400 + required-projects: + - openstack/requirements + +- job: + name: grenade-dsvm-ceilometer + parent: legacy-dsvm-base + run: playbooks/legacy/grenade-dsvm-ceilometer/run.yaml + post-run: playbooks/legacy/grenade-dsvm-ceilometer/post.yaml + timeout: 10800 + required-projects: + - openstack-dev/grenade + - openstack-infra/devstack-gate + - openstack/ceilometer + +- job: + name: telemetry-dsvm-integration-ceilometer + parent: legacy-dsvm-base + run: playbooks/legacy/telemetry-dsvm-integration-ceilometer/run.yaml + post-run: playbooks/legacy/telemetry-dsvm-integration-ceilometer/post.yaml + timeout: 7800 + required-projects: + - openstack-infra/devstack-gate + - openstack/aodh + - openstack/ceilometer + - openstack/panko + # following are required when DEVSTACK_GATE_HEAT, which this + # job turns on + - openstack/dib-utils + - openstack/diskimage-builder + +- project: + name: openstack/ceilometer + check: + jobs: + - ceilometer-dsvm-tempest-plugin-mongodb + - ceilometer-dsvm-tempest-plugin-mysql + - ceilometer-tox-py27-mongodb + - ceilometer-tox-py27-mysql + - ceilometer-tox-py27-postgresql + - telemetry-dsvm-integration-ceilometer + - ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only + gate: + jobs: + - ceilometer-dsvm-tempest-plugin-mongodb + - ceilometer-dsvm-tempest-plugin-mysql + - ceilometer-tox-py27-mongodb + - ceilometer-tox-py27-mysql + - ceilometer-tox-py27-postgresql + - telemetry-dsvm-integration-ceilometer + - ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only