From 3bf30acfc85e5945d93bdc12f938bd5178c5358b Mon Sep 17 00:00:00 2001 From: Don Penney Date: Fri, 1 Nov 2019 13:11:21 -0400 Subject: [PATCH] Move distributedcloud-client files to distcloud-client repo Change-Id: I905af4092b3dc2981463a19e665d4be47acd2fc6 Story: 2006166 Task: 37338 Signed-off-by: Don Penney --- centos_dev_wheels.inc | 1 - centos_iso_image.inc | 3 - centos_pkg_dirs | 1 - centos_stable_wheels.inc | 1 - .../centos/build_srpm.data | 5 - .../centos/distributedcloud-client.spec | 96 ------------------- 6 files changed, 107 deletions(-) delete mode 100644 centos_dev_wheels.inc delete mode 100644 centos_stable_wheels.inc delete mode 100644 openstack/distributedcloud-client/centos/build_srpm.data delete mode 100644 openstack/distributedcloud-client/centos/distributedcloud-client.spec diff --git a/centos_dev_wheels.inc b/centos_dev_wheels.inc deleted file mode 100644 index 9dd69e8b..00000000 --- a/centos_dev_wheels.inc +++ /dev/null @@ -1 +0,0 @@ -distributedcloud-client-wheels diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 7c668d35..9302aa16 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -43,9 +43,6 @@ starlingx-dashboard # openstack-keystone openstack-keystone -# distributedcloud-client -distributedcloud-client-dcmanagerclient - # rabbitmq-server rabbitmq-server diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 918b5120..7ee0a66d 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -22,4 +22,3 @@ openstack/rabbitmq-server openstack/python-openstackclient openstack/python-openstacksdk openstack/python-wsme -openstack/distributedcloud-client diff --git a/centos_stable_wheels.inc b/centos_stable_wheels.inc deleted file mode 100644 index 9dd69e8b..00000000 --- a/centos_stable_wheels.inc +++ /dev/null @@ -1 +0,0 @@ -distributedcloud-client-wheels diff --git a/openstack/distributedcloud-client/centos/build_srpm.data b/openstack/distributedcloud-client/centos/build_srpm.data deleted file mode 100644 index f368b187..00000000 --- a/openstack/distributedcloud-client/centos/build_srpm.data +++ /dev/null @@ -1,5 +0,0 @@ -TAR_NAME="distributedcloud-client" -SRC_DIR="$CGCS_BASE/git/distributedcloud-client" - -TIS_BASE_SRCREV=640ee2a980c72b6f97fdd5aef1a66196b4c09272 -TIS_PATCH_VER=GITREVCOUNT+2 diff --git a/openstack/distributedcloud-client/centos/distributedcloud-client.spec b/openstack/distributedcloud-client/centos/distributedcloud-client.spec deleted file mode 100644 index a1eec787..00000000 --- a/openstack/distributedcloud-client/centos/distributedcloud-client.spec +++ /dev/null @@ -1,96 +0,0 @@ -%global pypi_name distributedcloud-client - -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -%if 0%{?fedora} -%global with_python3 1 -%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')} -%endif - -Name: %{pypi_name} -Version: 1.0.0 -Release: 1%{?_tis_dist}.%{tis_patch_ver} -Summary: Client Library for Distributed Cloud Services - -License: ASL 2.0 -URL: unknown -Source0: %{pypi_name}-%{version}.tar.gz - -BuildArch: noarch - -BuildRequires: python2-devel -BuildRequires: python-setuptools -BuildRequires: python2-pip -BuildRequires: python2-wheel -BuildRequires: python-jsonschema >= 2.0.0 -BuildRequires: python-keystonemiddleware -BuildRequires: python-oslo-concurrency -BuildRequires: python-oslo-config -BuildRequires: python-oslo-context -BuildRequires: python-oslo-db -BuildRequires: python-oslo-i18n -BuildRequires: python-oslo-log -BuildRequires: python-oslo-messaging -BuildRequires: python-oslo-middleware -BuildRequires: python-oslo-policy -BuildRequires: python-oslo-rootwrap -BuildRequires: python-oslo-serialization -BuildRequires: python-oslo-service -BuildRequires: python-oslo-utils -BuildRequires: python-oslo-versionedobjects -BuildRequires: python-pbr >= 1.8 -BuildRequires: python-routes >= 1.12.3 -BuildRequires: python-sphinx -BuildRequires: python-sphinxcontrib-httpdomain -BuildRequires: pyOpenSSL -BuildRequires: systemd -BuildRequires: git -# Required to compile translation files -BuildRequires: python-babel - -%description -Client library for Distributed Cloud built on the Distributed Cloud API. It -provides a command-line tool (dcmanager). - -Distributed Cloud provides configuration and management of distributed clouds - -# DC Manager -%package dcmanagerclient -Summary: DC Manager Client - -%description dcmanagerclient -Distributed Cloud Manager Client - -%prep -%autosetup -n %{pypi_name}-%{version} -S git - -# Remove the requirements file so that pbr hooks don't add it -# to distutils requires_dist config -rm -rf {test-,}requirements.txt tools/{pip,test}-requires - -%build -export PBR_VERSION=%{version} -%{__python2} setup.py build -%py2_build_wheel - -%install -export PBR_VERSION=%{version} -%{__python2} setup.py install --skip-build --root %{buildroot} -mkdir -p $RPM_BUILD_ROOT/wheels -install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ - -%files dcmanagerclient -%license LICENSE -%{python2_sitelib}/dcmanagerclient* -%{python2_sitelib}/distributedcloud_client-*.egg-info -%exclude %{python2_sitelib}/dcmanagerclient/tests -%{_bindir}/dcmanager* - -%package wheels -Summary: %{name} wheels - -%description wheels -Contains python wheels for %{name} - -%files wheels -/wheels/*