From 69f3c476a1428db0275277075fd116e560419700 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Fri, 26 Apr 2024 11:41:16 -0400 Subject: [PATCH] Remove CentOS/OpenSUSE build support StarlingX stopped supporting CentOS builds in the after release 7.0. This update will strip CentOS from our code base. It will also remove references to the failed OpenSUSE feature as well. STORY: 2011110 TASK: 49949 49948 Change-Id: If8c5d8d04e0a5ae766239912886f93332614fa4e Signed-off-by: Scott Little --- centos_build_layer.cfg | 1 - centos_dev_docker_images.inc | 1 - centos_dev_wheels.inc | 1 - centos_iso_image.inc | 5 - centos_pkg_dirs | 1 - centos_stable_docker_images.inc | 1 - centos_stable_wheels.inc | 1 - distributedcloud/centos/build_srpm.data | 4 - distributedcloud/centos/distributedcloud.spec | 278 ------------------ .../stx-keystone-api-proxy.dev_docker_image | 27 -- ...stx-keystone-api-proxy.stable_docker_image | 29 -- 11 files changed, 349 deletions(-) delete mode 100644 centos_build_layer.cfg delete mode 100644 centos_dev_docker_images.inc delete mode 100644 centos_dev_wheels.inc delete mode 100644 centos_iso_image.inc delete mode 100644 centos_pkg_dirs delete mode 100644 centos_stable_docker_images.inc delete mode 100644 centos_stable_wheels.inc delete mode 100644 distributedcloud/centos/build_srpm.data delete mode 100644 distributedcloud/centos/distributedcloud.spec delete mode 100644 distributedcloud/centos/stx-keystone-api-proxy.dev_docker_image delete mode 100644 distributedcloud/centos/stx-keystone-api-proxy.stable_docker_image diff --git a/centos_build_layer.cfg b/centos_build_layer.cfg deleted file mode 100644 index c581999f5..000000000 --- a/centos_build_layer.cfg +++ /dev/null @@ -1 +0,0 @@ -flock diff --git a/centos_dev_docker_images.inc b/centos_dev_docker_images.inc deleted file mode 100644 index 3211ad056..000000000 --- a/centos_dev_docker_images.inc +++ /dev/null @@ -1 +0,0 @@ -distributedcloud diff --git a/centos_dev_wheels.inc b/centos_dev_wheels.inc deleted file mode 100644 index 1a90927e5..000000000 --- a/centos_dev_wheels.inc +++ /dev/null @@ -1 +0,0 @@ -distributedcloud-wheels diff --git a/centos_iso_image.inc b/centos_iso_image.inc deleted file mode 100644 index afe3256c0..000000000 --- a/centos_iso_image.inc +++ /dev/null @@ -1,5 +0,0 @@ -# distributedcloud -distributedcloud-dccommon -distributedcloud-dcmanager -distributedcloud-dcorch -distributedcloud-dcdbsync diff --git a/centos_pkg_dirs b/centos_pkg_dirs deleted file mode 100644 index 3211ad056..000000000 --- a/centos_pkg_dirs +++ /dev/null @@ -1 +0,0 @@ -distributedcloud diff --git a/centos_stable_docker_images.inc b/centos_stable_docker_images.inc deleted file mode 100644 index 3211ad056..000000000 --- a/centos_stable_docker_images.inc +++ /dev/null @@ -1 +0,0 @@ -distributedcloud diff --git a/centos_stable_wheels.inc b/centos_stable_wheels.inc deleted file mode 100644 index 1a90927e5..000000000 --- a/centos_stable_wheels.inc +++ /dev/null @@ -1 +0,0 @@ -distributedcloud-wheels diff --git a/distributedcloud/centos/build_srpm.data b/distributedcloud/centos/build_srpm.data deleted file mode 100644 index 3172dd3c1..000000000 --- a/distributedcloud/centos/build_srpm.data +++ /dev/null @@ -1,4 +0,0 @@ -SRC_DIR="." -COPY_LIST="$PKG_BASE/files/*" - -TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/distributedcloud/centos/distributedcloud.spec b/distributedcloud/centos/distributedcloud.spec deleted file mode 100644 index 6d67d05ef..000000000 --- a/distributedcloud/centos/distributedcloud.spec +++ /dev/null @@ -1,278 +0,0 @@ -%global pypi_name distributedcloud - -%global with_doc %{!?_without_doc:1}%{?_without_doc:0} -%{!?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: Distributed Cloud Services - -License: ASL 2.0 -URL: unknown -Source0: %{pypi_name}-%{version}.tar.gz -Source1: dcmanager-api.service -Source2: dcmanager-manager.service -Source3: dcorch-api.service -Source4: dcorch-engine.service -Source5: dcorch-sysinv-api-proxy.service -Source6: dcorch-identity-api-proxy.service -Source7: dcdbsync-api.service -Source8: dcdbsync-openstack-api.service -Source9: dcmanager.conf -Source10: dcorch.conf -Source11: dcdbsync.conf -Source12: clean-dcorch -Source13: dcmanager-audit.service -Source14: dcmanager-orchestrator.service -Source15: distcloud-syslog.conf -Source16: distcloud-logrotate.conf -Source17: dcmanager-audit-worker.service - -BuildArch: noarch - -BuildRequires: python-crypto -BuildRequires: python-cryptography -BuildRequires: python2-devel -BuildRequires: python-eventlet -BuildRequires: python-setuptools -BuildRequires: python2-pip -BuildRequires: python2-wheel -BuildRequires: python-jsonschema >= 2.0.0 -BuildRequires: python-keyring -BuildRequires: python-keystonemiddleware -BuildRequires: python-keystoneauth1 >= 3.1.0 -BuildRequires: python-netaddr -BuildRequires: python-oslo-concurrency >= 3.29.1 -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-pecan >= 1.0.0 -BuildRequires: python-routes >= 1.12.3 -BuildRequires: python-sphinx -BuildRequires: python-sphinxcontrib-httpdomain -BuildRequires: pyOpenSSL -BuildRequires: systemd -# Required to compile translation files -BuildRequires: python-babel - -%description -Distributed Cloud provides configuration and management of distributed clouds - -# DC Common -%package dccommon -Summary: DC common module -Requires: python-kubernetes - -%description dccommon -Distributed Cloud Common Module - -# DC Manager -%package dcmanager -Summary: DC Manager - -%description dcmanager -Distributed Cloud Manager - -%package dcorch -Summary: DC Orchestrator -# TODO(John): should we add Requires lines? -Requires: openstack-ras -Requires: python-psutil -Requires: python-retrying - -%description dcorch -Distributed Cloud Orchestrator - -%package dcdbsync -Summary: DC DCorch DBsync Agent - -%description dcdbsync -Distributed Cloud DCorch DBsync Agent - -%prep -%autosetup -n %{pypi_name}-%{version} - -# 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 -# Generate sample config and add the current directory to PYTHONPATH so -# oslo-config-generator doesn't skip heat's entry points. -PYTHONPATH=. oslo-config-generator --config-file=./dcmanager/config-generator.conf -PYTHONPATH=. oslo-config-generator --config-file=./dcorch/config-generator.conf -PYTHONPATH=. oslo-config-generator --config-file=./dcdbsync/config-generator.conf - - -%install -export PBR_VERSION=%{version} -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} \ - --single-version-externally-managed -install -d $RPM_BUILD_ROOT/wheels -install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ -install -d -m 755 %{buildroot}%{_tmpfilesdir} -install -d -m 755 %{buildroot}/var/log/dcmanager -install -d -m 755 %{buildroot}/var/cache/dcmanager -install -d -m 755 %{buildroot}%{_sysconfdir}/dcmanager/ -# TODO(kmacleod) Remove systemd unit files, they are not used: -# install systemd unit files -install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/dcmanager-api.service -install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/dcmanager-manager.service -install -p -D -m 644 %{SOURCE13} %{buildroot}%{_unitdir}/dcmanager-audit.service -install -p -D -m 644 %{SOURCE17} %{buildroot}%{_unitdir}/dcmanager-audit-worker.service -install -p -D -m 644 %{SOURCE14} %{buildroot}%{_unitdir}/dcmanager-orchestrator.service -install -p -D -m 644 %{SOURCE9} %{buildroot}%{_tmpfilesdir} -# install default config files -cd %{_builddir}/%{pypi_name}-%{version} && oslo-config-generator --config-file ./dcmanager/config-generator.conf --output-file %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcmanager/dcmanager.conf.sample -install -p -D -m 640 %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcmanager/dcmanager.conf.sample %{buildroot}%{_sysconfdir}/dcmanager/dcmanager.conf - -install -p -D -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/syslog-ng/conf.d/distcloud.conf -install -p -D -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/logrotate.d/distcloud.conf - -install -d -m 755 %{buildroot}/var/log/dcorch -install -d -m 755 %{buildroot}/var/cache/dcorch -install -d -m 755 %{buildroot}%{_sysconfdir}/dcorch/ -# TODO(kmacleod) Remove systemd unit files, they are not used: -# install systemd unit files -install -p -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/dcorch-api.service -install -p -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/dcorch-engine.service -install -p -D -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/dcorch-sysinv-api-proxy.service -install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/dcorch-identity-api-proxy.service -install -p -D -m 644 %{SOURCE10} %{buildroot}%{_tmpfilesdir} - -# install ocf scripts -install -d -m 755 ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack -install -p -D -m 755 ocf/* ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/ - -# install default config files -cd %{_builddir}/%{pypi_name}-%{version} && oslo-config-generator --config-file ./dcorch/config-generator.conf --output-file %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcorch/dcorch.conf.sample -install -p -D -m 640 %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcorch/dcorch.conf.sample %{buildroot}%{_sysconfdir}/dcorch/dcorch.conf - -# dc dbsync agent -install -d -m 755 %{buildroot}/var/log/dcdbsync -install -d -m 755 %{buildroot}/var/cache/dcdbsync -install -d -m 755 %{buildroot}%{_sysconfdir}/dcdbsync/ -# install systemd unit files -install -p -D -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/dcdbsync-api.service -# install systemd unit files for optional second instance -install -p -D -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/dcdbsync-openstack-api.service -install -p -D -m 644 %{SOURCE11} %{buildroot}%{_tmpfilesdir} -# install default config files -cd %{_builddir}/%{pypi_name}-%{version} && oslo-config-generator --config-file ./dcdbsync/config-generator.conf --output-file %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcdbsync/dcdbsync.conf.sample -install -p -D -m 640 %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcdbsync/dcdbsync.conf.sample %{buildroot}%{_sysconfdir}/dcdbsync/dcdbsync.conf - -# install ansible overrides dir -install -d -m 600 ${RPM_BUILD_ROOT}/var/opt/dc/ansible - -# install dcorch cleaner -install -m 755 -D -p %{SOURCE12} %{buildroot}/%{_bindir}/clean-dcorch - -%files dccommon -%license LICENSE -%{python2_sitelib}/dccommon* -%{python2_sitelib}/distributedcloud-*.egg-info -%exclude %{python2_sitelib}/dccommon/tests -%{_sysconfdir}/syslog-ng/conf.d/distcloud.conf -%{_sysconfdir}/logrotate.d/distcloud.conf - -%files dcmanager -%license LICENSE -%{python2_sitelib}/dcmanager* -%exclude %{python2_sitelib}/dcmanager/tests -%{_bindir}/dcmanager-api -%{_unitdir}/dcmanager-api.service -%{_bindir}/dcmanager-audit -%{_unitdir}/dcmanager-audit.service -%{_bindir}/dcmanager-audit-worker -%{_unitdir}/dcmanager-audit-worker.service -%{_bindir}/dcmanager-orchestrator -%{_unitdir}/dcmanager-orchestrator.service -%{_bindir}/dcmanager-manager -%{_unitdir}/dcmanager-manager.service -%{_bindir}/dcmanager-manage -%{_bindir}/dcmanager-state -%{_tmpfilesdir}/dcmanager.conf -%dir %attr(0755,root,root) %{_localstatedir}/log/dcmanager -%dir %attr(0755,root,root) %{_localstatedir}/cache/dcmanager -%dir %attr(0755,root,root) %{_sysconfdir}/dcmanager -%config(noreplace) %attr(-, root, root) %{_sysconfdir}/dcmanager/dcmanager.conf -%dir %attr(0755,root,root) /usr/lib/ocf/resource.d/openstack -%dir %attr(0600,root,root) /var/opt/dc/ansible -%defattr(-,root,root,-) -/usr/lib/ocf/resource.d/openstack/dcmanager-* - - -%files dcorch -%license LICENSE -%{python2_sitelib}/dcorch* -%exclude %{python2_sitelib}/dcorch/tests -%{_bindir}/dcorch-api -%{_unitdir}/dcorch-api.service -%{_bindir}/dcorch-engine -%{_unitdir}/dcorch-engine.service -%{_bindir}/dcorch-api-proxy -%{_unitdir}/dcorch-sysinv-api-proxy.service -%{_unitdir}/dcorch-identity-api-proxy.service -%{_bindir}/dcorch-manage -%{_bindir}/clean-dcorch -%{_tmpfilesdir}/dcorch.conf -%dir %attr(0755,root,root) %{_localstatedir}/log/dcorch -%dir %attr(0755,root,root) %{_localstatedir}/cache/dcorch -%dir %attr(0755,root,root) %{_sysconfdir}/dcorch -%config(noreplace) %attr(-, dcorch, dcorch) %{_sysconfdir}/dcorch/dcorch.conf -%dir %attr(0755,root,root) /usr/lib/ocf/resource.d/openstack -%defattr(-,root,root,-) -/usr/lib/ocf/resource.d/openstack/dcorch-* - - -%files dcdbsync -%license LICENSE -%{python2_sitelib}/dcdbsync* -%exclude %{python2_sitelib}/dcdbsync/tests -%{_bindir}/dcdbsync-api -%{_unitdir}/dcdbsync-api.service -%{_unitdir}/dcdbsync-openstack-api.service -%{_tmpfilesdir}/dcdbsync.conf -%dir %attr(0755,root,root) %{_localstatedir}/log/dcdbsync -%dir %attr(0755,root,root) %{_localstatedir}/cache/dcdbsync -%dir %attr(0755,root,root) %{_sysconfdir}/dcdbsync -%config(noreplace) %attr(-, root, root) %{_sysconfdir}/dcdbsync/dcdbsync.conf -%dir %attr(0755,root,root) /usr/lib/ocf/resource.d/openstack -%defattr(-,root,root,-) -/usr/lib/ocf/resource.d/openstack/dcdbsync-* - -%pre dcorch -getent group dcorch >/dev/null || groupadd -r --gid 173 dcorch -getent passwd dcorch >/dev/null || \ -useradd --uid 173 -r -g dcorch -d /var/lib/dcorch -s /sbin/nologin \ --c "dcorch Daemons" dcorch -exit 0 - -%package wheels -Summary: %{name} wheels - -%description wheels -Contains python wheels for %{name} - -%files wheels -/wheels/* diff --git a/distributedcloud/centos/stx-keystone-api-proxy.dev_docker_image b/distributedcloud/centos/stx-keystone-api-proxy.dev_docker_image deleted file mode 100644 index 6f4e070cf..000000000 --- a/distributedcloud/centos/stx-keystone-api-proxy.dev_docker_image +++ /dev/null @@ -1,27 +0,0 @@ -BUILDER=loci -LABEL=stx-keystone-api-proxy -PROJECT=infra -PROJECT_REPO=nil -PIP_PACKAGES=" - distributedcloud \ - cgcs-patch \ - tsconfig \ - eventlet \ - pecan \ - SQLAlchemy \ - pycrypto \ - psycopg2 \ - fmclient \ - python-barbicanclient \ - oslo.concurrency \ - oslo.config \ - oslo.db \ - oslo.log \ - oslo.messaging \ - oslo.middleware \ - oslo.policy \ - oslo.service \ - oslo.versionedobjects \ - keystonemiddleware \ - " -PYTHON3=no diff --git a/distributedcloud/centos/stx-keystone-api-proxy.stable_docker_image b/distributedcloud/centos/stx-keystone-api-proxy.stable_docker_image deleted file mode 100644 index 567c2f5f9..000000000 --- a/distributedcloud/centos/stx-keystone-api-proxy.stable_docker_image +++ /dev/null @@ -1,29 +0,0 @@ -BUILDER=loci -LABEL=stx-keystone-api-proxy -PROJECT=infra -PROJECT_REPO=nil -PIP_PACKAGES=" - distributedcloud \ - cgcs-patch \ - tsconfig \ - eventlet \ - pecan \ - SQLAlchemy \ - cryptography \ - cgtsclient \ - sysinv \ - psycopg2 \ - fmclient \ - python-barbicanclient \ - oslo.concurrency \ - oslo.config \ - oslo.db \ - oslo.log \ - oslo.messaging \ - oslo.middleware \ - oslo.policy \ - oslo.service \ - oslo.versionedobjects \ - keystonemiddleware \ - " -PYTHON3=no