From 7a811bd893c7b0200be8552e8008dd3f6ec48b39 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 31 May 2019 17:53:14 +0200 Subject: [PATCH 01/69] whitespace fix --- resalloc.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 4c54aa4..7906040 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -58,11 +58,11 @@ BuildRequires: python-yaml Requires: %default_python-%srcname = %version-%release -Source0: https://github.com/praiskup/%name/releases/download/v%version/%name-%version.tar.gz -Source1: resalloc.service -Source2: logrotate -Source3: merge-hook-logs -Source4: cron.hourly +Source0: https://github.com/praiskup/%name/releases/download/v%version/%name-%version.tar.gz +Source1: resalloc.service +Source2: logrotate +Source3: merge-hook-logs +Source4: cron.hourly %description %desc @@ -73,8 +73,8 @@ The %name package provides the client-side tooling. %package server Summary: %sum - server part -Requires: crontabs -Requires: logrotate +Requires: crontabs +Requires: logrotate Requires: %default_python-%srcname = %version-%release %if %{with python3} Requires: python3-alembic From 48a81ac3c0fd1fae929aa13323afcf0d50da9eea Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 11 Jun 2019 11:39:57 +0200 Subject: [PATCH 02/69] update to release 2.4 Version: 2.4-1 --- resalloc.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 7906040..a24054c 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,8 +27,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 2.3 -Release: 3%{?dist} +Version: 2.4 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -227,6 +227,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Tue Jun 11 2019 Pavel Raiskup - 2.4-1 +- fix improperly handled thread communication + * Fri May 10 2019 Pavel Raiskup - 2.3-3 - drop mkhomedir requires leftover - configure logrotate to compress rotated logs diff --git a/sources b/sources index 9526a74..c7d1bf8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-2.3.tar.gz) = ea158b59e1cc2e74d7915436d9ae111c05c5ae5541f09fe4fada6325e67fce4ac2d5d8ab45adc7d1e5323e4b1338b30da76c2b88126f38109c9580f5c5a91482 +SHA512 (resalloc-2.4.tar.gz) = df05dbeb68a8cbf45c5aa745d75875c084e2a00e15b06b9f1faaaf9b025091d84aa30779f5e1405d7e20e10fffb6461416d0633e9b8d34184ff46a97cd3ff383 From 2179f5f13be90c2ff6e4a0540dda33d662b04224 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 13 Jun 2019 06:52:11 +0200 Subject: [PATCH 03/69] update to latest release Version: 2.5-1 --- resalloc.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index a24054c..ced88e2 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,7 +27,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 2.4 +Version: 2.5 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc @@ -227,6 +227,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Thu Jun 13 2019 Pavel Raiskup - 2.5-1 +- thread safety - don't change os.environ + * Tue Jun 11 2019 Pavel Raiskup - 2.4-1 - fix improperly handled thread communication diff --git a/sources b/sources index c7d1bf8..982e85d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-2.4.tar.gz) = df05dbeb68a8cbf45c5aa745d75875c084e2a00e15b06b9f1faaaf9b025091d84aa30779f5e1405d7e20e10fffb6461416d0633e9b8d34184ff46a97cd3ff383 +SHA512 (resalloc-2.5.tar.gz) = 624549c11e9e546e3d0eb58c90df813aff0b4b17d9d37e11a5c2be99239104d93a9e920bad3200e9d8787d42024bbf219413eb0ed9c8bb6b72404eaf4ae5d045 From f9981c350212709d2a36af586f2e971c44df157b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 18:30:46 +0000 Subject: [PATCH 04/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index ced88e2..1cf5fb5 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -227,6 +227,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jun 13 2019 Pavel Raiskup - 2.5-1 - thread safety - don't change os.environ From 2aa624aaeec073547d28a979b4fbe8ba97c6056a Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 2 Aug 2019 08:49:55 +0200 Subject: [PATCH 05/69] new release Previous version had bug so the server assigned resources to closed tickets, so a lot of wasted resources. Version: 2.6-1 --- resalloc.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index ced88e2..92b3f90 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,7 +27,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 2.5 +Version: 2.6 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc @@ -227,6 +227,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Fri Aug 02 2019 Pavel Raiskup - 2.6-1 +- don't assign resources to closed tickets + * Thu Jun 13 2019 Pavel Raiskup - 2.5-1 - thread safety - don't change os.environ diff --git a/sources b/sources index 982e85d..00b3b27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-2.5.tar.gz) = 624549c11e9e546e3d0eb58c90df813aff0b4b17d9d37e11a5c2be99239104d93a9e920bad3200e9d8787d42024bbf219413eb0ed9c8bb6b72404eaf4ae5d045 +SHA512 (resalloc-2.6.tar.gz) = 794b41e85806a474c0458c32c5fb19e2f21fed9d9405fc8619d1cc4e892156a533ce25a37c8edf70eae94f656021b50e73bf64fbb87101a18d778410aea1919b From 4b1c35f648b0ab2d9826a1f1127d64bb022baca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:04:50 +0200 Subject: [PATCH 06/69] Rebuilt for Python 3.8 --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index ff7aaa4..ab06de4 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 2.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -227,6 +227,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Mon Aug 19 2019 Miro Hrončok - 2.6-2 +- Rebuilt for Python 3.8 + * Fri Aug 02 2019 Pavel Raiskup - 2.6-1 - don't assign resources to closed tickets From 5d45804dad883e3636a623707f44b879d1c586b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:37:59 +0200 Subject: [PATCH 07/69] Rebuilt for Python 3.8.0rc1 (#1748018) --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index ab06de4..5b75233 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 2.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -227,6 +227,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Thu Oct 03 2019 Miro Hrončok - 2.6-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 2.6-2 - Rebuilt for Python 3.8 From 04e61dc815272d435aaa7e402b478c2ac4576176 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 17:36:46 +0000 Subject: [PATCH 08/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 5b75233..12093f0 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 2.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -227,6 +227,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Oct 03 2019 Miro Hrončok - 2.6-3 - Rebuilt for Python 3.8.0rc1 (#1748018) From f4a5aa0281b10896c546d655e58eb3ead544adbf Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sun, 17 May 2020 12:37:37 +0200 Subject: [PATCH 09/69] Release 3.0 --- resalloc.spec | 25 ++++++++++++++++++------- sources | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 12093f0..297c550 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,8 +27,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 2.6 -Release: 4%{?dist} +Version: 3.0 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -40,6 +40,8 @@ BuildRequires: postgresql-server BuildRequires: python3-alembic BuildRequires: python3-devel BuildRequires: python3-psycopg2 +BuildRequires: python3-pytest +BuildRequires: python3-pytest-cov BuildRequires: python3-setuptools BuildRequires: python3-six BuildRequires: python3-sqlalchemy @@ -50,6 +52,9 @@ BuildRequires: python3-yaml BuildRequires: python-alembic BuildRequires: python2-devel BuildRequires: python-psycopg2 +BuildRequires: python2-mock +BuildRequires: python2-pytest +BuildRequires: python2-pytest-cov BuildRequires: python2-setuptools BuildRequires: python2-six BuildRequires: python-sqlalchemy @@ -121,7 +126,7 @@ to the resalloc server. %prep -%setup -q +%autosetup -p1 -n %name-%version %build @@ -183,16 +188,18 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %systemd_postun_with_restart resalloc.service +%doc_files NEWS README + %files +%doc %doc_files %license COPYING -%doc README %{_bindir}/%{name} %_mandir/man1/%{name}.1* %if %{with python3} %files -n python3-%srcname -%doc README +%doc %doc_files %license COPYING %{python3_sitelib}/%{name} %{python3_sitelib}/%{name}-*.egg-info @@ -201,7 +208,7 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %if %{with python2} %files -n python2-%srcname -%doc README +%doc %doc_files %license COPYING %{python2_sitelib}/%{name} %{python2_sitelib}/%{name}-*.egg-info @@ -209,7 +216,7 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %files server -%doc README +%doc %doc_files %license COPYING %{default_sitelib}/%{name}server %{_bindir}/%{name}-server @@ -227,6 +234,10 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Sun May 17 2020 Pavel Raiskup - 3.0-1 +- new 3.0 version - new possibility to re-use resources, and client requests can + survive server restarts + * Thu Jan 30 2020 Fedora Release Engineering - 2.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 00b3b27..0ce799a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-2.6.tar.gz) = 794b41e85806a474c0458c32c5fb19e2f21fed9d9405fc8619d1cc4e892156a533ce25a37c8edf70eae94f656021b50e73bf64fbb87101a18d778410aea1919b +SHA512 (resalloc-3.0.tar.gz) = 9f9015eaef34e555ae40d944084e7956e8d0649df74db1219c2a19b3f7fece46b208d6b86ff0649c1d06e762788719266d5bf588abe92f3421b05890e425bd59 From 1dab131e4b391b083e2ca6f2e1f0b27f9c6638bf Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sun, 17 May 2020 12:54:09 +0200 Subject: [PATCH 10/69] doc files typo Version: 3.0-1 --- resalloc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 297c550..ae39d38 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -188,7 +188,7 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %systemd_postun_with_restart resalloc.service -%doc_files NEWS README +%global doc_files NEWS README %files %doc %doc_files From d9041062ea015a80eb17e21c87d8d8ef0dbcf6ad Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 17 May 2020 14:13:38 +0200 Subject: [PATCH 11/69] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 4afa7263cd54e613c37bc38962df3f28b224c0f7 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sun, 17 May 2020 14:34:50 +0200 Subject: [PATCH 12/69] cleanup unwanted epel8 branch content --- README.md | 3 --- package.cfg | 2 -- 2 files changed, 5 deletions(-) delete mode 100644 README.md delete mode 100644 package.cfg diff --git a/README.md b/README.md deleted file mode 100644 index a2a9e16..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# resalloc - -Client/Server application for managing (expensive) resources \ No newline at end of file diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 7947a2436bf678180e999511a66d44ac066a1442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:49:04 +0200 Subject: [PATCH 13/69] Rebuilt for Python 3.9 --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index ae39d38..a6262b9 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 3.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -234,6 +234,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Tue May 26 2020 Miro Hrončok - 3.0-2 +- Rebuilt for Python 3.9 + * Sun May 17 2020 Pavel Raiskup - 3.0-1 - new 3.0 version - new possibility to re-use resources, and client requests can survive server restarts From c7dd7bc3a3a014031e0a6d4eaf49b7db6b0527d1 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 26 May 2020 10:23:17 +0200 Subject: [PATCH 14/69] New upstream release Version: 3.1-1 --- resalloc.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index a6262b9..d30a80e 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,8 +27,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 3.0 -Release: 2%{?dist} +Version: 3.1 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -234,6 +234,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Tue May 26 2020 Pavel Raiskup - 3.1-1 +- new version v3.1, improved resource checker + * Tue May 26 2020 Miro Hrončok - 3.0-2 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 0ce799a..1617e5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-3.0.tar.gz) = 9f9015eaef34e555ae40d944084e7956e8d0649df74db1219c2a19b3f7fece46b208d6b86ff0649c1d06e762788719266d5bf588abe92f3421b05890e425bd59 +SHA512 (resalloc-3.1.tar.gz) = 3e578774b3268c40760cc9b727c6575b6513354678668f4d103058068bd93ff5c9d1039a813737787d686f09fe08faa9b3ee3b7b5dc167ad12035c87b2c566d6 From 7d5247bf28c7304296cc87dcd8be2a7630e7d2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 12:41:32 +0200 Subject: [PATCH 15/69] Rebuilt for Python 3.9 --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index d30a80e..e975f27 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -234,6 +234,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Tue May 26 2020 Miro Hrončok - 3.1-2 +- Rebuilt for Python 3.9 + * Tue May 26 2020 Pavel Raiskup - 3.1-1 - new version v3.1, improved resource checker From b99b29b9809fb29072065e06fdb51b4cedcd235e Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 2 Jun 2020 07:05:50 +0200 Subject: [PATCH 16/69] New upstream release Version: 3.2-1 --- resalloc.spec | 11 +++++++++-- sources | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index e975f27..a459a41 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,8 +27,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 3.1 -Release: 2%{?dist} +Version: 3.2 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -234,6 +234,13 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Tue Jun 02 2020 Pavel Raiskup - 3.2-1 +- new configuration option cmd_release - command to be run before we mark the + resource as reusable again +- after server restart, schedule all inconsistent resources to be terminated + (mitigates issue#41) +- systemd service is restarted upon failure (just in case) + * Tue May 26 2020 Miro Hrončok - 3.1-2 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 1617e5e..24c56c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-3.1.tar.gz) = 3e578774b3268c40760cc9b727c6575b6513354678668f4d103058068bd93ff5c9d1039a813737787d686f09fe08faa9b3ee3b7b5dc167ad12035c87b2c566d6 +SHA512 (resalloc-3.2.tar.gz) = 11ce8e7e45340628da90689401f80a67f46b7c90659f3bc7583dab32b6dc83080f352f9a11078a0f885a7694b4d1e2a0240eedfe8682d71efcdeb7fd6a396640 From 7e22274c78924f68deaf77b4b4153919812004f8 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 25 Jun 2020 13:53:16 +0200 Subject: [PATCH 17/69] New upstream release Version: 3.3-1 --- resalloc.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index a459a41..3246bae 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,7 +27,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 3.2 +Version: 3.3 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc @@ -234,6 +234,10 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Thu Jun 25 2020 Pavel Raiskup - 3.3-1 +- new release, mostly fixing one bug causing traceback on too-long stdout output + from AllocWorker script + * Tue Jun 02 2020 Pavel Raiskup - 3.2-1 - new configuration option cmd_release - command to be run before we mark the resource as reusable again diff --git a/sources b/sources index 24c56c3..7225866 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-3.2.tar.gz) = 11ce8e7e45340628da90689401f80a67f46b7c90659f3bc7583dab32b6dc83080f352f9a11078a0f885a7694b4d1e2a0240eedfe8682d71efcdeb7fd6a396640 +SHA512 (resalloc-3.3.tar.gz) = a6c2512b73ad7639666915be95cd137e2144a691c392f3b678514e357f795d15a4837c3d72e807b65dc1cee7cccc6f87a53de450aba878f7029512276580b357 From 6777daf7eb0413c01b71525a694f678be55681a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:43:16 +0000 Subject: [PATCH 18/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 3246bae..6006492 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 3.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -234,6 +234,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jun 25 2020 Pavel Raiskup - 3.3-1 - new release, mostly fixing one bug causing traceback on too-long stdout output from AllocWorker script From ad443074f6911bc009e97054a6d6a5258c60a620 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 20:46:43 +0000 Subject: [PATCH 19/69] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- resalloc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/resalloc.spec b/resalloc.spec index 6006492..3c02404 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -33,6 +33,7 @@ License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch +BuildRequires: make BuildRequires: postgresql-server From 8c29411692cd9402919009ec2ddc4bbae26936c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 15:15:42 +0000 Subject: [PATCH 20/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 3c02404..cd5698d 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 3.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -235,6 +235,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e49fcda23d753bff476db941a4cf1dd37c46fbff Mon Sep 17 00:00:00 2001 From: Silvie Chlupova Date: Fri, 19 Feb 2021 08:38:23 +0100 Subject: [PATCH 21/69] New version 3.4 --- resalloc.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index cd5698d..a21257f 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,8 +27,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 3.3 -Release: 3%{?dist} +Version: 3.4 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -235,6 +235,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Fri Feb 19 2021 Silvie Chlupova - 3.4-1 +- New upstream release v3.4 + * Wed Jan 27 2021 Fedora Release Engineering - 3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 7225866..2ff581d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-3.3.tar.gz) = a6c2512b73ad7639666915be95cd137e2144a691c392f3b678514e357f795d15a4837c3d72e807b65dc1cee7cccc6f87a53de450aba878f7029512276580b357 +SHA512 (resalloc-3.4.tar.gz) = 4b172251f81dcb6feb4be786271afcfc8ed14fbbf429bf407d6451502a07ce1a7154f45f255890306e7dacc87421cba314a2ba36deeaa2aeca7bb0b45c43b332 From fcfa1cca091b40bf495deba1572c38dc58407f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:51 +0100 Subject: [PATCH 22/69] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- resalloc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index a21257f..93dc295 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 3.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -235,6 +235,10 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.4-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Fri Feb 19 2021 Silvie Chlupova - 3.4-1 - New upstream release v3.4 From a0e3ee446d484d1bf3deeddee06473d0d4f2f55f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:13:16 +0200 Subject: [PATCH 23/69] Rebuilt for Python 3.10 --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 93dc295..a5fcc8f 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 3.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -235,6 +235,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Fri Jun 04 2021 Python Maint - 3.4-3 +- Rebuilt for Python 3.10 + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.4-2 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 7226b2a3911fee870e3a34cb096424ce351d2a4e Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 9 Jun 2021 15:45:54 +0200 Subject: [PATCH 24/69] New release 3.6 with performance fixes Version: 3.6-1 --- resalloc.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index a5fcc8f..8f69873 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,8 +27,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 3.4 -Release: 3%{?dist} +Version: 3.6 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -235,6 +235,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Wed Jun 09 2021 Pavel Raiskup - 3.6-1 +- rebase to a new version having DB performance fixes + * Fri Jun 04 2021 Python Maint - 3.4-3 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 2ff581d..e3d1b38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-3.4.tar.gz) = 4b172251f81dcb6feb4be786271afcfc8ed14fbbf429bf407d6451502a07ce1a7154f45f255890306e7dacc87421cba314a2ba36deeaa2aeca7bb0b45c43b332 +SHA512 (resalloc-3.6.tar.gz) = ed3fa2f808c2f6b11e3f05e0235271c5a967ef3b672fe4b15abad22104c6fbe749b24dc17e7953b87660efcbc9b12cf8d2a7929acf369ca6901758877bb52e70 From 4bb9959ed1fd8f7ffac0b0cd48f6292b26494273 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 22 Jun 2021 14:00:26 +0200 Subject: [PATCH 25/69] New bugfix release Version: 3.7-1 --- resalloc.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 8f69873..0ba8646 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,7 +27,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 3.6 +Version: 3.7 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc @@ -235,6 +235,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Tue Jun 22 2021 Pavel Raiskup - 3.7-1 +- new upstream release, see NEWS file + * Wed Jun 09 2021 Pavel Raiskup - 3.6-1 - rebase to a new version having DB performance fixes diff --git a/sources b/sources index e3d1b38..c4c9184 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-3.6.tar.gz) = ed3fa2f808c2f6b11e3f05e0235271c5a967ef3b672fe4b15abad22104c6fbe749b24dc17e7953b87660efcbc9b12cf8d2a7929acf369ca6901758877bb52e70 +SHA512 (resalloc-3.7.tar.gz) = d30e14c66a55417a8cf65a081d55c3494f4ae747bd705370b67244cd4d1bf0d34c72d552ce1217fa120611ef9e2f59fc2e0b9a7a842c1dacb04274c5a1c22df2 From 87ab216c7980e34bbc4ad0916fcf9c226c5d3288 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 22 Jun 2021 14:13:12 +0200 Subject: [PATCH 26/69] Package a new script (sync with upstream spec file) Version: 3.7-1 --- resalloc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/resalloc.spec b/resalloc.spec index 0ba8646..333d449 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -222,6 +222,7 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %{default_sitelib}/%{name}server %{_bindir}/%{name}-server %{_bindir}/%{name}-maint +%{_bindir}/%{name}-check-vm-ip %attr(0700, %sysuser, %sysgroup) %dir %{_sysconfdir}/%{name}server %config(noreplace) %{_sysconfdir}/%{name}server/* %_unitdir/resalloc.service From d69b8352fe2e174dc4c7496cd5e2e9999cca3bcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 11:22:45 +0000 Subject: [PATCH 27/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 333d449..2f4093c 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 3.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -236,6 +236,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jun 22 2021 Pavel Raiskup - 3.7-1 - new upstream release, see NEWS file From ab2f8a61bd462b96f6652015944bfe5c52e4cbe1 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 23 Aug 2021 11:49:26 +0200 Subject: [PATCH 28/69] new upstream release (see NEWS file) Version: 4-1 --- resalloc.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 2f4093c..64b1d7f 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,8 +27,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 3.7 -Release: 2%{?dist} +Version: 4 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -236,6 +236,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Mon Aug 23 2021 Pavel Raiskup - 4-1 +- new release, with tag-priority + * Fri Jul 23 2021 Fedora Release Engineering - 3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index c4c9184..4b4bc35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-3.7.tar.gz) = d30e14c66a55417a8cf65a081d55c3494f4ae747bd705370b67244cd4d1bf0d34c72d552ce1217fa120611ef9e2f59fc2e0b9a7a842c1dacb04274c5a1c22df2 +SHA512 (resalloc-4.tar.gz) = 6c53a919a398f169cb8912a575690ed74dfba60f6eef53b725d071ccab0bfbc31a22ec51c54d66ecd157d7a7bb2ed59977e6b430fb73cc1ccaf503d24a098591 From 584509edea7b5e954dcbc60af7b57f8892566375 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 24 Aug 2021 09:31:25 +0200 Subject: [PATCH 29/69] New bugfix release Version: 4.1-1 --- resalloc.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 64b1d7f..2113993 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,7 +27,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 4 +Version: 4.1 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc @@ -236,6 +236,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Tue Aug 24 2021 Pavel Raiskup - 4.1-1 +- bugfix release, with prioritized released resources again + * Mon Aug 23 2021 Pavel Raiskup - 4-1 - new release, with tag-priority diff --git a/sources b/sources index 4b4bc35..bf83483 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-4.tar.gz) = 6c53a919a398f169cb8912a575690ed74dfba60f6eef53b725d071ccab0bfbc31a22ec51c54d66ecd157d7a7bb2ed59977e6b430fb73cc1ccaf503d24a098591 +SHA512 (resalloc-4.1.tar.gz) = 578448e770f931bbc61a23adc319df50b4b473ed07a1d2ee5002ab735ac39f1eb0081afc843900af7d7eac23e85b9551d6169b38a571ec46b14ca59759ad44bc From 2950f76207406d4a7e5a746557d463b8f7c85001 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 20 Jan 2022 06:59:09 +0100 Subject: [PATCH 30/69] New upstream release https://github.com/praiskup/resalloc/releases/tag/v4.2 Version: 4.2-1 --- resalloc.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 2113993..b7d1ff2 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,7 +27,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 4.1 +Version: 4.2 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc @@ -236,6 +236,10 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Thu Jan 20 2022 Pavel Raiskup - 4.2-1 +- new upstream release: + https://github.com/praiskup/resalloc/releases/tag/v4.2 + * Tue Aug 24 2021 Pavel Raiskup - 4.1-1 - bugfix release, with prioritized released resources again diff --git a/sources b/sources index bf83483..f7a132b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-4.1.tar.gz) = 578448e770f931bbc61a23adc319df50b4b473ed07a1d2ee5002ab735ac39f1eb0081afc843900af7d7eac23e85b9551d6169b38a571ec46b14ca59759ad44bc +SHA512 (resalloc-4.2.tar.gz) = 0e940d926e7b871c2f7a09776a2cff95abe263cf6a8356896c95b8dcb27beb8fe7367760720d76cfcc9c7a58bfcbcef2fbdc6bb7ebe9cee3cdaa8f3350952af2 From d7e789de67a267e80016a6e8121d9cf480295113 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 4 May 2022 13:03:07 +0200 Subject: [PATCH 31/69] New upstream release https://github.com/praiskup/resalloc/releases/tag/v4.3 Version: 4.3-1 --- resalloc.spec | 38 +++++++++++++++++++++++++++++++++++++- sources | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index b7d1ff2..5b44294 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,7 +27,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 4.2 +Version: 4.3 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc @@ -46,8 +46,13 @@ BuildRequires: python3-pytest-cov BuildRequires: python3-setuptools BuildRequires: python3-six BuildRequires: python3-sqlalchemy +%if 0%{?is_opensuse} +BuildRequires: python3-PyYAML +BuildRequires: cron +%else BuildRequires: python3-yaml %endif +%endif %if %{with python2} BuildRequires: python-alembic @@ -101,6 +106,22 @@ Requires(pre): /usr/sbin/useradd The %name-server package provides the resalloc server, and some tooling for resalloc administrators. +%if %{with python3} +%package webui +Summary: %sum - webui part + +%if %{with python3} +Requires: %default_python-%srcname = %version-%release +Requires: %name-server +Requires: python3-flask +%endif + +%description webui +%desc + +The %name-webui package provides the resalloc webui, +it shows page with information about resalloc resources. +%endif %if %{with python3} %package -n python3-%srcname @@ -141,8 +162,12 @@ to the resalloc server. %install %if %{with python2} %py2_install +rm -r %buildroot%python2_sitelib/%{name}webui %else %py3_install +install -d -m 700 %buildroot%_datadir/%{name}webui +cp -r %{name}webui/templates %buildroot%_datadir/%{name}webui/ +cp -r %{name}webui/static %buildroot%_datadir/%{name}webui/ %endif mkdir -p %buildroot%_unitdir @@ -234,8 +259,19 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %_libexecdir/resalloc-merge-hook-logs %config %attr(0755, root, root) %{_sysconfdir}/cron.hourly/resalloc +%if %{with python3} +%files webui +%doc %doc_files +%license COPYING +%{default_sitelib}/%{name}webui/ +%_datadir/%{name}webui/ +%endif %changelog +* Thu Jan 20 2022 Pavel Raiskup - 4.3-1 +- new upstream release: + https://github.com/praiskup/resalloc/releases/tag/v4.3 + * Thu Jan 20 2022 Pavel Raiskup - 4.2-1 - new upstream release: https://github.com/praiskup/resalloc/releases/tag/v4.2 diff --git a/sources b/sources index f7a132b..4009b04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-4.2.tar.gz) = 0e940d926e7b871c2f7a09776a2cff95abe263cf6a8356896c95b8dcb27beb8fe7367760720d76cfcc9c7a58bfcbcef2fbdc6bb7ebe9cee3cdaa8f3350952af2 +SHA512 (resalloc-4.3.tar.gz) = e48dc3ccdb1c62ebabc01ce609fbe11f7a832fec054c78494e831c98983f3c290523bcfd0e855ddbac8f80b1e906badc9aedea95e870608c76a14615e734dc4d From 24892fe1f393ed2cd8d0bce766bedc63df1cb7c7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 14 Jun 2022 15:47:14 +0200 Subject: [PATCH 32/69] Rebuilt for Python 3.11 --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 5b44294..bdbcf31 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 4.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -268,6 +268,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %endif %changelog +* Tue Jun 14 2022 Python Maint - 4.3-2 +- Rebuilt for Python 3.11 + * Thu Jan 20 2022 Pavel Raiskup - 4.3-1 - new upstream release: https://github.com/praiskup/resalloc/releases/tag/v4.3 From 82da20f1123b8450fea55532d5be3552e2dde5d7 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Tue, 21 Jun 2022 18:29:52 -0400 Subject: [PATCH 33/69] New upstream version v4.4 https://github.com/praiskup/resalloc/releases/tag/v4.4 --- resalloc.service | 3 ++- resalloc.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/resalloc.service b/resalloc.service index 5099103..e29ae38 100644 --- a/resalloc.service +++ b/resalloc.service @@ -4,7 +4,8 @@ After=network.target [Service] Type=simple - +Restart=always +RestartSec=5 User=resalloc Group=resalloc diff --git a/resalloc.spec b/resalloc.spec index bdbcf31..c3f9e1e 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -14,7 +14,7 @@ the purposes of CI/CD tasks. %bcond_without check -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?is_opensuse} %bcond_with python2 %bcond_without python3 %else @@ -27,8 +27,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 4.3 -Release: 2%{?dist} +Version: 4.4 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -165,7 +165,7 @@ to the resalloc server. rm -r %buildroot%python2_sitelib/%{name}webui %else %py3_install -install -d -m 700 %buildroot%_datadir/%{name}webui +install -d -m 755 %buildroot%_datadir/%{name}webui cp -r %{name}webui/templates %buildroot%_datadir/%{name}webui/ cp -r %{name}webui/static %buildroot%_datadir/%{name}webui/ %endif @@ -248,7 +248,7 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %{_bindir}/%{name}-server %{_bindir}/%{name}-maint %{_bindir}/%{name}-check-vm-ip -%attr(0700, %sysuser, %sysgroup) %dir %{_sysconfdir}/%{name}server +%attr(0750, %sysuser, %sysgroup) %dir %{_sysconfdir}/%{name}server %config(noreplace) %{_sysconfdir}/%{name}server/* %_unitdir/resalloc.service %attr(0700, %sysuser, %sysgroup) %dir %_logdir @@ -268,6 +268,10 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %endif %changelog +* Wed Jun 22 2022 Jakub Kadlcik - 4.4-1 +- New upstream version: + https://github.com/praiskup/resalloc/releases/tag/v4.4 + * Tue Jun 14 2022 Python Maint - 4.3-2 - Rebuilt for Python 3.11 diff --git a/sources b/sources index 4009b04..6e245ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-4.3.tar.gz) = e48dc3ccdb1c62ebabc01ce609fbe11f7a832fec054c78494e831c98983f3c290523bcfd0e855ddbac8f80b1e906badc9aedea95e870608c76a14615e734dc4d +SHA512 (resalloc-4.4.tar.gz) = 1064cd71000a7199b19be82dbbde30582974a9674109880da4c34ee87dd37c7901ea805e6dfd6f569d431fa81e303fdc5a159acae1546e55f3dca30625f24409 From 034cb4b562e844f78ab05396e70b6c2fc8ab94df Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 23 Jun 2022 15:15:25 +0200 Subject: [PATCH 34/69] New upstream release Version: 4.5-1 --- resalloc.spec | 10 +++++++++- sources | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index c3f9e1e..9bf6dfb 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,7 +27,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 4.4 +Version: 4.5 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc @@ -168,6 +168,9 @@ rm -r %buildroot%python2_sitelib/%{name}webui install -d -m 755 %buildroot%_datadir/%{name}webui cp -r %{name}webui/templates %buildroot%_datadir/%{name}webui/ cp -r %{name}webui/static %buildroot%_datadir/%{name}webui/ + +install -d -m 755 %buildroot%_var/www/ +cp -r %{name}webui/cgi-resalloc %buildroot%_var/www/cgi-%{name} %endif mkdir -p %buildroot%_unitdir @@ -265,9 +268,14 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %license COPYING %{default_sitelib}/%{name}webui/ %_datadir/%{name}webui/ +%_var/www/cgi-%{name} %endif %changelog +* Thu Jun 23 2022 Pavel Raiskup - 4.5-1 +- New upstream version: + https://github.com/praiskup/resalloc/releases/tag/v4.5 + * Wed Jun 22 2022 Jakub Kadlcik - 4.4-1 - New upstream version: https://github.com/praiskup/resalloc/releases/tag/v4.4 diff --git a/sources b/sources index 6e245ce..c434afe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-4.4.tar.gz) = 1064cd71000a7199b19be82dbbde30582974a9674109880da4c34ee87dd37c7901ea805e6dfd6f569d431fa81e303fdc5a159acae1546e55f3dca30625f24409 +SHA512 (resalloc-4.5.tar.gz) = 4ee78f68be909a480189f0be5cb1deaf3673f7aefee911d38862279b8fbecd6faf3cff9d1a4870b0c525ef50fab494b5be655df61dcd41adf72449f1ee429c47 From ce5d779a01383e57d761650192a0453a5b69217d Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 23 Jun 2022 15:18:39 +0200 Subject: [PATCH 35/69] Adding a release helper --- build-and-update-all-branches | 39 +++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100755 build-and-update-all-branches diff --git a/build-and-update-all-branches b/build-and-update-all-branches new file mode 100755 index 0000000..53768c2 --- /dev/null +++ b/build-and-update-all-branches @@ -0,0 +1,39 @@ +#! /bin/sh + +# Prepare main branch, review the list of branches below and then execute this +# script. + +branches='main epel7 epel8 epel9 f35 f36' + +exit_handler () +{ + git checkout main +} + +trap exit_handler EXIT + +set -e +set -x + +koji hello + +tasks= +for branch in $branches; do + if test $branch != main; then + git checkout "$branch" + git merge main + fi + git push + skip_nvr_check= + if test $branch = epel7; then + skip_nvr_check=--skip-nvr-check + fi + tasks="${tasks}`fedpkg build $skip_nvr_check --nowait | grep 'Created task' | cut -d: -f2`" +done + +if test -n "$tasks"; then + koji watch-task $tasks +fi + +git checkout main +fedpkg update From a9f18b73e0a38830d9fa345cd03afcb60fad076e Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Wed, 29 Jun 2022 17:54:50 +0200 Subject: [PATCH 36/69] New upstream version v4.6 --- resalloc.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 9bf6dfb..26c8a68 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,7 +27,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 4.5 +Version: 4.6 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc @@ -272,6 +272,10 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %endif %changelog +* Wed Jun 29 2022 Jakub Kadlcik - 4.6-1 +- New upstream version: + https://github.com/praiskup/resalloc/releases/tag/v4.6 + * Thu Jun 23 2022 Pavel Raiskup - 4.5-1 - New upstream version: https://github.com/praiskup/resalloc/releases/tag/v4.5 diff --git a/sources b/sources index c434afe..22e5ef0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-4.5.tar.gz) = 4ee78f68be909a480189f0be5cb1deaf3673f7aefee911d38862279b8fbecd6faf3cff9d1a4870b0c525ef50fab494b5be655df61dcd41adf72449f1ee429c47 +SHA512 (resalloc-4.6.tar.gz) = 10b64a99dcfa500284ca8af0be8f23ec28e5dc754f4488bd0c8de72e7429e10d933e9327ed0aa9345a7bfd7d874ac68a6abea8bf4874b58f9b453dba1551f7cb From 2d084958fc4bde600ae4540e8847f7b231dd8366 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Wed, 29 Jun 2022 18:39:50 +0200 Subject: [PATCH 37/69] Add resalloc-selinux subpackage --- resalloc.spec | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 26c8a68..83611fb 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 4.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -114,6 +114,7 @@ Summary: %sum - webui part Requires: %default_python-%srcname = %version-%release Requires: %name-server Requires: python3-flask +Recommends: %name-selinux %endif %description webui @@ -147,6 +148,22 @@ to the resalloc server. %endif +%package selinux +Summary: SELinux module for %{name} +Requires: %name-webui = %version-%release +# Requires(post): policycoreutils-python +BuildRequires: selinux-policy-devel +%{?selinux_requires} + +%description selinux +%desc + +%post selinux +semanage fcontext -a -t httpd_sys_script_exec_t \ + %_var/www/cgi-%{name} 2>/dev/null || : +restorecon -R %_var/www/cgi-%{name} || : + + %prep %autosetup -p1 -n %name-%version @@ -170,7 +187,7 @@ cp -r %{name}webui/templates %buildroot%_datadir/%{name}webui/ cp -r %{name}webui/static %buildroot%_datadir/%{name}webui/ install -d -m 755 %buildroot%_var/www/ -cp -r %{name}webui/cgi-resalloc %buildroot%_var/www/cgi-%{name} +install -p -m 755 %{name}webui/cgi-resalloc %buildroot%_var/www/cgi-%{name} %endif mkdir -p %buildroot%_unitdir @@ -271,7 +288,13 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %_var/www/cgi-%{name} %endif +%files selinux + + %changelog +* Wed Jun 29 2022 Jakub Kadlcik - 4.6-2 +- Add resalloc-selinux subpackage + * Wed Jun 29 2022 Jakub Kadlcik - 4.6-1 - New upstream version: https://github.com/praiskup/resalloc/releases/tag/v4.6 From 8b887a57460c8ba9006ecd00fa593b4fea204a08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 00:44:10 +0000 Subject: [PATCH 38/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 83611fb..e521a12 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 4.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -292,6 +292,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 29 2022 Jakub Kadlcik - 4.6-2 - Add resalloc-selinux subpackage From 33926ec1f35b01ff9c4182bd787b8e79fe3ab05b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 20 Sep 2022 18:51:49 +0200 Subject: [PATCH 39/69] New upstream release https://github.com/praiskup/resalloc/releases/tag/v4.7 Version: 4.7-1 --- build-and-update-all-branches | 2 +- resalloc.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build-and-update-all-branches b/build-and-update-all-branches index 53768c2..fd1e0cb 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -3,7 +3,7 @@ # Prepare main branch, review the list of branches below and then execute this # script. -branches='main epel7 epel8 epel9 f35 f36' +branches='main epel7 epel8 epel9 f35 f36 f37' exit_handler () { diff --git a/resalloc.spec b/resalloc.spec index e521a12..682eb06 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,8 +27,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 4.6 -Release: 3%{?dist} +Version: 4.7 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -292,6 +292,10 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Tue Sep 20 2022 Pavel Raiskup - 4.7-1 +- new upstream release: + https://github.com/praiskup/resalloc/releases/tag/v4.7 + * Sat Jul 23 2022 Fedora Release Engineering - 4.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 22e5ef0..36f4cb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-4.6.tar.gz) = 10b64a99dcfa500284ca8af0be8f23ec28e5dc754f4488bd0c8de72e7429e10d933e9327ed0aa9345a7bfd7d874ac68a6abea8bf4874b58f9b453dba1551f7cb +SHA512 (resalloc-4.7.tar.gz) = b9dffe5ab8149aea33c748127e8850f6b1be8d7698d96b9d609a0a386b814ebfa125f4304b4f8427221618a8224dcc2a86e40ed33a322b6c66c0f91e165826a6 From 03bb1df82e729888270751d6909c78a1af8df968 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 23 Sep 2022 10:09:34 +0200 Subject: [PATCH 40/69] New upstream release Version: 4.8-1 --- resalloc.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 682eb06..92d1940 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,7 +27,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 4.7 +Version: 4.8 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc @@ -292,6 +292,10 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Fri Sep 23 2022 Pavel Raiskup - 4.8-1 +- new upstream release: + https://github.com/praiskup/resalloc/releases/tag/v4.8 + * Tue Sep 20 2022 Pavel Raiskup - 4.7-1 - new upstream release: https://github.com/praiskup/resalloc/releases/tag/v4.7 diff --git a/sources b/sources index 36f4cb6..d4a30ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-4.7.tar.gz) = b9dffe5ab8149aea33c748127e8850f6b1be8d7698d96b9d609a0a386b814ebfa125f4304b4f8427221618a8224dcc2a86e40ed33a322b6c66c0f91e165826a6 +SHA512 (resalloc-4.8.tar.gz) = b92b21966d926f94556c479935afc26d64c5f84f31c08269ebff0178c5f73f72b4e6fb5d411b263b45d912bbb65aad8816fd88808c507490f50ea4cbe4bc0e91 From 9d87d62618f3a27fb6abe5279c71a481b1f41e71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 19:41:13 +0000 Subject: [PATCH 41/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 92d1940..1235951 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 4.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -292,6 +292,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Sep 23 2022 Pavel Raiskup - 4.8-1 - new upstream release: https://github.com/praiskup/resalloc/releases/tag/v4.8 From 688d6344d1e115d7dc674374743c3504809e0ee9 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 23 Jan 2023 09:38:54 +0100 Subject: [PATCH 42/69] New upstream release Version: 4.9-1 --- resalloc.spec | 11 ++++++++--- sources | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 1235951..64688f7 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,9 +27,9 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 4.8 -Release: 2%{?dist} -License: GPLv2+ +Version: 4.9 +Release: 1%{?dist} +License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -39,6 +39,7 @@ BuildRequires: postgresql-server %if %{with python3} BuildRequires: python3-alembic +BuildRequires: python3-argparse-manpage BuildRequires: python3-devel BuildRequires: python3-psycopg2 BuildRequires: python3-pytest @@ -56,6 +57,7 @@ BuildRequires: python3-yaml %if %{with python2} BuildRequires: python-alembic +BuildRequires: python2-argparse-manpage BuildRequires: python2-devel BuildRequires: python-psycopg2 BuildRequires: python2-mock @@ -292,6 +294,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Po led 23 2023 Pavel Raiskup - 4.9-1 +* new upstream release https://github.com/praiskup/resalloc/releases/tag/v4.9 + * Fri Jan 20 2023 Fedora Release Engineering - 4.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index d4a30ad..62fef95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-4.8.tar.gz) = b92b21966d926f94556c479935afc26d64c5f84f31c08269ebff0178c5f73f72b4e6fb5d411b263b45d912bbb65aad8816fd88808c507490f50ea4cbe4bc0e91 +SHA512 (resalloc-4.9.tar.gz) = 9bfac59012123cba36799f6bcfd4039bfdb5ec0a7aa36d7f55c51a6fd28979d6eaa78f29afb189868f8713d4bcbf052de723f93617f7cda1ba048d1ce97c1000 From f78f566921d1138d297febd22c2e0e821839fb36 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 23 Jan 2023 10:08:33 +0100 Subject: [PATCH 43/69] Fixed changelog date, stop releasing for F35 Version: 4.9-1 --- build-and-update-all-branches | 2 +- resalloc.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-and-update-all-branches b/build-and-update-all-branches index fd1e0cb..e846796 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -3,7 +3,7 @@ # Prepare main branch, review the list of branches below and then execute this # script. -branches='main epel7 epel8 epel9 f35 f36 f37' +branches='main epel7 epel8 epel9 f36 f37' exit_handler () { diff --git a/resalloc.spec b/resalloc.spec index 64688f7..0eeeee7 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -294,8 +294,8 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog -* Po led 23 2023 Pavel Raiskup - 4.9-1 -* new upstream release https://github.com/praiskup/resalloc/releases/tag/v4.9 +* Mon Jan 23 2023 Pavel Raiskup - 4.9-1 +- new upstream release https://github.com/praiskup/resalloc/releases/tag/v4.9 * Fri Jan 20 2023 Fedora Release Engineering - 4.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0e6158a6c3179971195b71d3991302d2d3835e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 30 Jan 2023 21:43:19 +0100 Subject: [PATCH 44/69] Rebuilt to change Python shebangs to /usr/bin/python3.6 on EPEL 8 See https://lists.fedoraproject.org/archives/list/epel-devel@lists.fedoraproject.org/thread/RE3PG72B5AX7NTACPDSBGOWCMN7I3OQJ/ --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 0eeeee7..baf7d48 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 4.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -294,6 +294,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Mon Jan 30 2023 Miro Hrončok - 4.9-2 +- Rebuilt to change Python shebangs to /usr/bin/python3.6 on EPEL 8 + * Mon Jan 23 2023 Pavel Raiskup - 4.9-1 - new upstream release https://github.com/praiskup/resalloc/releases/tag/v4.9 From 69bc92178d1aa71089ae04cffa17c56f4c0c6bbf Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 4 Jul 2023 11:13:50 +0200 Subject: [PATCH 45/69] Rebuilt for Python 3.12 --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index baf7d48..5b06503 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 4.9 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -294,6 +294,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Tue Jul 04 2023 Python Maint - 4.9-3 +- Rebuilt for Python 3.12 + * Mon Jan 30 2023 Miro Hrončok - 4.9-2 - Rebuilt to change Python shebangs to /usr/bin/python3.6 on EPEL 8 From 5075f0ca7c4b4a8d5c199abf4f765593584dd682 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 16:46:41 +0000 Subject: [PATCH 46/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 5b06503..c700ff3 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -28,7 +28,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 4.9 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -294,6 +294,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 4.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 04 2023 Python Maint - 4.9-3 - Rebuilt for Python 3.12 From 01845884865b383b779314398c7e1d9cc726ec5d Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 11 Aug 2023 10:05:37 +0200 Subject: [PATCH 47/69] New upstream release with "on demand" resources Version: 5.0-1 --- build-and-update-all-branches | 2 +- resalloc.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build-and-update-all-branches b/build-and-update-all-branches index e846796..aefeec9 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -3,7 +3,7 @@ # Prepare main branch, review the list of branches below and then execute this # script. -branches='main epel7 epel8 epel9 f36 f37' +branches='main f39 f38 f37 epel7 epel8 epel9' exit_handler () { diff --git a/resalloc.spec b/resalloc.spec index c700ff3..cbf5a14 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -27,8 +27,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 4.9 -Release: 4%{?dist} +Version: 5.0 +Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -236,7 +236,7 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %systemd_postun_with_restart resalloc.service -%global doc_files NEWS README +%global doc_files NEWS README.md %files %doc %doc_files @@ -294,6 +294,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Fri Aug 11 2023 Pavel Raiskup - 5.0-1 +- new upstream release https://github.com/praiskup/resalloc/releases/tag/v5.0 + * Fri Jul 21 2023 Fedora Release Engineering - 4.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 62fef95..50934f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-4.9.tar.gz) = 9bfac59012123cba36799f6bcfd4039bfdb5ec0a7aa36d7f55c51a6fd28979d6eaa78f29afb189868f8713d4bcbf052de723f93617f7cda1ba048d1ce97c1000 +SHA512 (resalloc-5.0.tar.gz) = d80ff76a663034a81d69b78a6e910e9bbcecae0977f3e74c8213f76469149d19c3b8953eaa917b2df23c85f551d26d5e41e5188b3050c7e93316873c16d6cf3c From e5b007b815f378cc175fc2dec789bacd2dfc53b1 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 6 Nov 2023 15:59:17 +0100 Subject: [PATCH 48/69] New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.1 Version: 5.1-1 --- resalloc-agent-spawner.service | 15 +++++++ resalloc.spec | 76 +++++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 resalloc-agent-spawner.service diff --git a/resalloc-agent-spawner.service b/resalloc-agent-spawner.service new file mode 100644 index 0000000..b4bb2c6 --- /dev/null +++ b/resalloc-agent-spawner.service @@ -0,0 +1,15 @@ +[Unit] +Description=Start self-stending agent-like resources using Resalloc +After=syslog.target network.target auditd.service + +[Service] +Type=simple +User=resalloc +Group=resalloc +ExecStart=/usr/bin/resalloc-agent-spawner +# we don't want to kill background action processors (daemoncontext) +KillMode=process +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/resalloc.spec b/resalloc.spec index cbf5a14..bcfcbcd 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -2,9 +2,20 @@ %global sysuser resalloc %global sysgroup %sysuser -%global _logdir %_var/log/%{name}server %global _homedir %_sharedstatedir/%{name}server +%global agent_user resalloc-agent-spawner +%global agent_group %agent_user + +%global create_user_group() \ +getent group "%1" >/dev/null || groupadd -r "%1" \ +getent passwd "%1" >/dev/null || \\\ +useradd -r -g "%2" -G "%2" -s "%3" \\\ + -c "%1 service user" "%1" \\\ + -d "%4" + +%global _logdir %_var/log/%{name}server + %global sum Resource allocator for expensive resources %global desc \ The resalloc project aims to help with taking care of dynamically \ @@ -27,7 +38,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.0 +Version: 5.1 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc @@ -73,6 +84,7 @@ Requires: %default_python-%srcname = %version-%release Source0: https://github.com/praiskup/%name/releases/download/v%version/%name-%version.tar.gz Source1: resalloc.service +Source5: resalloc-agent-spawner.service Source2: logrotate Source3: merge-hook-logs Source4: cron.hourly @@ -126,6 +138,24 @@ The %name-webui package provides the resalloc webui, it shows page with information about resalloc resources. %endif +%if %{with python3} +%package agent-spawner +Summary: %sum - daemon starting agent-like resources + +Requires(pre): /usr/sbin/useradd +Requires: python3-copr-common + +%description agent-spawner +%desc + +Agent Spawner maintains sets resources (agents) of certain kind and in certain +number, according to given configuration. Typical Resalloc resource is +completely dummy, fully controlled from the outside. With agent-like resources +this is different — such resources are self-standing, they take care of +themselves, perhaps interacting/competing with each other. The only thing that +agent-spawner needs to do is to control the ideal number of them. +%endif + %if %{with python3} %package -n python3-%srcname Summary: %sum - Python 3 client library @@ -152,7 +182,6 @@ to the resalloc server. %package selinux Summary: SELinux module for %{name} -Requires: %name-webui = %version-%release # Requires(post): policycoreutils-python BuildRequires: selinux-policy-devel %{?selinux_requires} @@ -168,6 +197,9 @@ restorecon -R %_var/www/cgi-%{name} || : %prep %autosetup -p1 -n %name-%version +%if %{without python3} +rm -r resalloc_agent_spawner +%endif %build @@ -195,6 +227,9 @@ install -p -m 755 %{name}webui/cgi-resalloc %buildroot%_var/www/cgi-%{name} mkdir -p %buildroot%_unitdir mkdir -p %buildroot%_logdir install -p -m 644 %SOURCE1 %buildroot%_unitdir +%if %{with python3} +install -p -m 644 %SOURCE5 %buildroot%_unitdir +%endif install -d -m 700 %buildroot%_homedir install -d -m 700 %buildroot%_sysconfdir/logrotate.d install -p -m 644 %SOURCE2 %buildroot%_sysconfdir/logrotate.d/resalloc-server @@ -204,6 +239,11 @@ install -p -m 755 %SOURCE3 %buildroot/%_libexecdir/%name-merge-hook-logs install -d %buildroot%_sysconfdir/cron.hourly install -p -m 755 %SOURCE4 %buildroot%_sysconfdir/cron.hourly/resalloc +%if %{without python3} +rm %buildroot%_bindir/%name-agent-* +rm %buildroot%_sysconfdir/resalloc-agent-spawner/config.yaml +%endif + %if %{with check} %check @@ -220,14 +260,7 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %pre server -user=%sysuser -group=%sysgroup -getent group "$user" >/dev/null || groupadd -r "$group" -getent passwd "$user" >/dev/null || \ -useradd -r -g "$group" -G "$group" -s /bin/bash \ - -c "resalloc server's user" "$user" \ - -d "%_homedir" - +%create_user_group %sysuser %sysgroup /bin/bash %_homedir %post server %systemd_post resalloc.service @@ -236,6 +269,18 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %systemd_postun_with_restart resalloc.service +%if %{with python3} +%pre agent-spawner +%create_user_group %agent_user %agent_group /bin/false / + +%post agent-spawner +%systemd_post resalloc-agent-spawner.service + +%postun agent-spawner +%systemd_postun_with_restart resalloc-agent-spawner.service +%endif + + %global doc_files NEWS README.md %files @@ -282,6 +327,12 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %config %attr(0755, root, root) %{_sysconfdir}/cron.hourly/resalloc %if %{with python3} +%files agent-spawner +%_bindir/resalloc-agent* +%{default_sitelib}/%{name}_agent_spawner +%_unitdir/resalloc-agent-spawner.service +%config(noreplace) %_sysconfdir/resalloc-agent-spawner + %files webui %doc %doc_files %license COPYING @@ -294,6 +345,9 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \ %changelog +* Mon Nov 06 2023 Pavel Raiskup - 5.1-1 +- new upstream release https://github.com/praiskup/resalloc/releases/tag/v5.1 + * Fri Aug 11 2023 Pavel Raiskup - 5.0-1 - new upstream release https://github.com/praiskup/resalloc/releases/tag/v5.0 diff --git a/sources b/sources index 50934f1..281955a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.0.tar.gz) = d80ff76a663034a81d69b78a6e910e9bbcecae0977f3e74c8213f76469149d19c3b8953eaa917b2df23c85f551d26d5e41e5188b3050c7e93316873c16d6cf3c +SHA512 (resalloc-5.1.tar.gz) = 2ce355ecec7441d2b4f589f6e152422a316fa6dda8c0d737c29f8d12d6627b240ff3e46fa04e9664882228cc11b94c03f0d4fca25064e8e1c6848ec3fce11946 From 21be3e002782c0cd24ecbc9944fc953498bc73a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 11:20:52 +0000 Subject: [PATCH 49/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index bcfcbcd..4073678 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -39,7 +39,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -345,6 +345,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Nov 06 2023 Pavel Raiskup - 5.1-1 - new upstream release https://github.com/praiskup/resalloc/releases/tag/v5.1 From d54e87f453b0cc35b3b27074efb7862de0d064a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 15:12:04 +0000 Subject: [PATCH 50/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 4073678..b3956cb 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -39,7 +39,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -345,6 +345,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2c449aed0c291d6b883db20c543f7631eff0dafb Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 28 Feb 2024 08:32:11 +0100 Subject: [PATCH 51/69] New upstream release Version: 5.2-1 --- resalloc.spec | 17 +++++- sources | 2 +- wait-for-ssh | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 wait-for-ssh diff --git a/resalloc.spec b/resalloc.spec index b3956cb..6eb9e6b 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -38,8 +38,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.1 -Release: 3%{?dist} +Version: 5.2 +Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -88,6 +88,8 @@ Source5: resalloc-agent-spawner.service Source2: logrotate Source3: merge-hook-logs Source4: cron.hourly +# GPL-2.0-or-later too +Source6: https://raw.githubusercontent.com/praiskup/wait-for-ssh/main/wait-for-ssh %description %desc @@ -144,6 +146,9 @@ Summary: %sum - daemon starting agent-like resources Requires(pre): /usr/sbin/useradd Requires: python3-copr-common +Requires: python3-daemon +Requires: python3-redis +Requires: python3-setproctitle %description agent-spawner %desc @@ -204,10 +209,13 @@ rm -r resalloc_agent_spawner %build %if %{with python2} +python=%__python2 %py2_build %else %py3_build +python=%__python3 %endif +sed "1c#! $python" %SOURCE6 > %{name}-wait-for-ssh %install @@ -238,6 +246,7 @@ install -d -m 755 %buildroot/%_libexecdir install -p -m 755 %SOURCE3 %buildroot/%_libexecdir/%name-merge-hook-logs install -d %buildroot%_sysconfdir/cron.hourly install -p -m 755 %SOURCE4 %buildroot%_sysconfdir/cron.hourly/resalloc +install -p -m 755 %name-wait-for-ssh %buildroot%_bindir/%name-wait-for-ssh %if %{without python3} rm %buildroot%_bindir/%name-agent-* @@ -315,6 +324,7 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %{_bindir}/%{name}-server %{_bindir}/%{name}-maint %{_bindir}/%{name}-check-vm-ip +%{_bindir}/%{name}-wait-for-ssh %attr(0750, %sysuser, %sysgroup) %dir %{_sysconfdir}/%{name}server %config(noreplace) %{_sysconfdir}/%{name}server/* %_unitdir/resalloc.service @@ -345,6 +355,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Wed Feb 28 2024 Pavel Raiskup - 5.2-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.2 + * Fri Jan 26 2024 Fedora Release Engineering - 5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 281955a..045cf41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.1.tar.gz) = 2ce355ecec7441d2b4f589f6e152422a316fa6dda8c0d737c29f8d12d6627b240ff3e46fa04e9664882228cc11b94c03f0d4fca25064e8e1c6848ec3fce11946 +SHA512 (resalloc-5.2.tar.gz) = c3df15356865d6db5514a8b936c2848c90e54f21379e267a4e286be8cd9cb4c477378c14b0d45ed4755334b541aa0b2e1c640b38f054cb3d997fe0ec0229a71d diff --git a/wait-for-ssh b/wait-for-ssh new file mode 100644 index 0000000..d302c77 --- /dev/null +++ b/wait-for-ssh @@ -0,0 +1,161 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# Copyright (C) 2017 Pavel Raiskup +# +# This program accepts one argument IP or HOSTNAME. First try to connect to the +# HOSTNAME as 'root' user. If cloud-init scripts instruct us to use different +# user than 'root', switch to that user and check again. In the end, print the +# successful username on stdout. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +from re import compile as re_compile +import sys +from os import devnull +from threading import Thread, Event +from argparse import ArgumentParser +from subprocess import Popen, PIPE +import logging + +handler = logging.StreamHandler() +log = logging.getLogger() +log.setLevel(logging.INFO) +log.addHandler(handler) + +# create console handler and set level to debug + +ssh = [ + 'ssh', + '-o', 'StrictHostKeyChecking=no', + '-o', 'UserKnownHostsFile=/dev/null', + '-o', 'PasswordAuthentication=no', + '-o', 'ConnectTimeout=10', +] + +expected_output = 'foobar' +inner_cmd = 'echo ' + expected_output + + +class Checker(Thread): + user = 'root' + daemon = True + user_re = '[a-zA-Z0-9_.][a-zA-Z0-9_.-]*[$]?' + re_clouduser = re_compile('Please login as the user "({0})"'.format(user_re)) + event = Event() + + def loop(self): + cmd = ssh + [ + '{0}@{1}'.format(self.user, self.args.host), + inner_cmd, + ] + + with open(devnull, 'w') as drop: + log.debug('executing: ' + ' '.join(cmd)) + self.child = Popen(cmd, stdout=PIPE, stderr=drop) + (stdout, _) = self.child.communicate() + + exp = (expected_output + '\n').encode('ascii') + if self.child.returncode == 0 and stdout == exp: + if self.args.print_user: + print(self.user) + return True + + if self.args.cloud_user: + match = self.re_clouduser.search(str(stdout)) + if match: + self.user = match.group(1) + log.info('cloud user switched to ' + self.user) + return False + + def run(self): + while True: + if self.loop(): + # Success! + break + + if self.event.wait(1): + log.debug("stopping per kill event") + break + + def kill(self): + self.event.set() + + # Best effort kill. + try: + self.child.kill() + except: + pass + self.join() + + +parser = ArgumentParser( + description="Wait till the host's ssh becomes responsive.") +parser.add_argument('host', help='hostname or IP') +parser.add_argument('--timeout', + help='seconds to wait before failure, default=indefinitely', + default=None, type=float) +parser.add_argument('--check-cloud-user', action='store_true', default=False, + dest='cloud_user', + help='if cloud-init disallows "root" login, try to detect the cloud ' \ + +'user and use that') +parser.add_argument('--print-user', action='store_true', default=False, + dest='print_user', + help='print the username which succeeded to connect on stdout') +parser.add_argument('--log', default=False, + dest='log_verbosity', + help='set the threshold for logging, e.g. debug, info, error, ...') + + +def main(): + sleep_period = 1.0 + args = parser.parse_args() + + if args.log_verbosity: + log.setLevel(logging.getLevelName(args.log_verbosity.upper())) + + def timeouted(): + if args.timeout is None: + return False + log.debug("wait {0}s, remains {1}s".format(sleep_period, args.timeout)) + args.timeout -= sleep_period + return args.timeout <= 0 + + checker = Checker() + checker.args = args + checker.start() + + try: + # threading.join() is not Ctrl-C interruptable :( in python2, so we need + # this ugly infinite loop. + # https://stackoverflow.com/questions/25676835/signal-handling-in-multi-threaded-python + while True: + checker.join(sleep_period) + if not checker.is_alive(): + # Success! + return 0 + + if timeouted(): + log.error("timeout!") + checker.kill() + return 1 + + except KeyboardInterrupt: + log.error("interrupt by user") + checker.kill() + return 1 + +if __name__ == "__main__": + sys.exit(main()) From 388f5e356bb2dceecd104ca4907ee1b2f7877f28 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 28 Feb 2024 08:35:53 +0100 Subject: [PATCH 52/69] Build for F40 --- build-and-update-all-branches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-and-update-all-branches b/build-and-update-all-branches index aefeec9..e93f5d8 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -3,7 +3,7 @@ # Prepare main branch, review the list of branches below and then execute this # script. -branches='main f39 f38 f37 epel7 epel8 epel9' +branches='main f40 f39 f38 epel7 epel8 epel9' exit_handler () { From 11c0cf61ca4c73eb159b3dc3265a7308bbb59dc3 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 28 Feb 2024 09:02:24 +0100 Subject: [PATCH 53/69] New upstream release Version: 5.3-1 --- resalloc.spec | 27 ++++++++++++++++++++++++--- sources | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 6eb9e6b..1258902 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -38,7 +38,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.2 +Version: 5.3 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc @@ -103,6 +103,7 @@ Summary: %sum - server part Requires: crontabs Requires: logrotate Requires: %default_python-%srcname = %version-%release +Requires: %srcname-helpers = %version-%release %if %{with python3} Requires: python3-alembic Requires: python3-six @@ -122,6 +123,17 @@ Requires(pre): /usr/sbin/useradd The %name-server package provides the resalloc server, and some tooling for resalloc administrators. + +%package helpers +Summary: %sum - helper/library scripts + +%description helpers +%desc + +Helper and library-like scripts for external Resalloc plugins like resalloc-aws, +resalloc-openstack, etc. + + %if %{with python3} %package webui Summary: %sum - webui part @@ -323,8 +335,6 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %{default_sitelib}/%{name}server %{_bindir}/%{name}-server %{_bindir}/%{name}-maint -%{_bindir}/%{name}-check-vm-ip -%{_bindir}/%{name}-wait-for-ssh %attr(0750, %sysuser, %sysgroup) %dir %{_sysconfdir}/%{name}server %config(noreplace) %{_sysconfdir}/%{name}server/* %_unitdir/resalloc.service @@ -336,6 +346,14 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %_libexecdir/resalloc-merge-hook-logs %config %attr(0755, root, root) %{_sysconfdir}/cron.hourly/resalloc + +%files helpers +%doc %doc_files +%license COPYING +%{_bindir}/%{name}-check-vm-ip +%{_bindir}/%{name}-wait-for-ssh + + %if %{with python3} %files agent-spawner %_bindir/resalloc-agent* @@ -355,6 +373,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Wed Feb 28 2024 Pavel Raiskup - 5.3-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.3 + * Wed Feb 28 2024 Pavel Raiskup - 5.2-1 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.2 diff --git a/sources b/sources index 045cf41..56b8ef9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.2.tar.gz) = c3df15356865d6db5514a8b936c2848c90e54f21379e267a4e286be8cd9cb4c477378c14b0d45ed4755334b541aa0b2e1c640b38f054cb3d997fe0ec0229a71d +SHA512 (resalloc-5.3.tar.gz) = 4bb4c087567edfc4b33b4e6537ce078217aba2dbd1705a6c894029460f847f1bb890e5d78fec8da3e8d4147f8b8849cf84130d7f23cb3a3f277ae00e85cf84e5 From 7d5694c44fe029afed34a061a3e2829a149021b4 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 15 Mar 2024 15:51:24 +0100 Subject: [PATCH 54/69] New upstream release Version: 5.4-1 --- resalloc.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 1258902..e3a3d08 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -38,7 +38,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.3 +Version: 5.4 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc @@ -157,9 +157,10 @@ it shows page with information about resalloc resources. Summary: %sum - daemon starting agent-like resources Requires(pre): /usr/sbin/useradd -Requires: python3-copr-common +Requires: python3-copr-common >= 0.23 Requires: python3-daemon Requires: python3-redis +Requires: python3-resalloc = %version-%release Requires: python3-setproctitle %description agent-spawner @@ -373,6 +374,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Fri Mar 15 2024 Pavel Raiskup - 5.4-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.4 + * Wed Feb 28 2024 Pavel Raiskup - 5.3-1 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.3 diff --git a/sources b/sources index 56b8ef9..363ae44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.3.tar.gz) = 4bb4c087567edfc4b33b4e6537ce078217aba2dbd1705a6c894029460f847f1bb890e5d78fec8da3e8d4147f8b8849cf84130d7f23cb3a3f277ae00e85cf84e5 +SHA512 (resalloc-5.4.tar.gz) = b827c8bd80c4813582ea499d74db406017d3be99f32f3db97a4f41a560bc1e96f3c19ba78a32ac498a2900ecca8ad4caa5d2bded359031e600d6f0ff704c5290 From 4c5ff134978df7095e3951fef34169dc00592285 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 24 Apr 2024 11:05:33 +0200 Subject: [PATCH 55/69] New upstream release Version: 5.5-1 --- resalloc.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index e3a3d08..db45191 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -38,7 +38,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.4 +Version: 5.5 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc @@ -374,6 +374,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Wed Apr 24 2024 Pavel Raiskup - 5.5-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.5 + * Fri Mar 15 2024 Pavel Raiskup - 5.4-1 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.4 diff --git a/sources b/sources index 363ae44..30218a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.4.tar.gz) = b827c8bd80c4813582ea499d74db406017d3be99f32f3db97a4f41a560bc1e96f3c19ba78a32ac498a2900ecca8ad4caa5d2bded359031e600d6f0ff704c5290 +SHA512 (resalloc-5.5.tar.gz) = d555ab49825a238d6e06ab8feadb3dbac6bae5bede3b38aedcbf433001b9c9a2dfd27f6fadab7d3c9471ff1996e60e6a5124ef2da1ec51bf5d525244e30b71c7 From ec0b2a774b2deb67fd74236b0dd47c20c0e3767a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 17:13:14 +0200 Subject: [PATCH 56/69] Rebuilt for Python 3.13 --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index db45191..77a7722 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -39,7 +39,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -374,6 +374,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Sun Jun 09 2024 Python Maint - 5.5-2 +- Rebuilt for Python 3.13 + * Wed Apr 24 2024 Pavel Raiskup - 5.5-1 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.5 From d182f79e3d5569e048e1201562f2c1b22f96d0d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 18:30:01 +0000 Subject: [PATCH 57/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 77a7722..127a014 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -39,7 +39,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -374,6 +374,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 5.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 09 2024 Python Maint - 5.5-2 - Rebuilt for Python 3.13 From 7261b0d62e8f98cb0bc40f2aacb17d987bdf5fe9 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 7 Oct 2024 09:10:58 +0200 Subject: [PATCH 58/69] New upstream release Version: 5.6-1 --- build-and-update-all-branches | 2 +- resalloc.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build-and-update-all-branches b/build-and-update-all-branches index e93f5d8..04b3544 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -3,7 +3,7 @@ # Prepare main branch, review the list of branches below and then execute this # script. -branches='main f40 f39 f38 epel7 epel8 epel9' +branches='main f41 f40 f39 epel8 epel9' exit_handler () { diff --git a/resalloc.spec b/resalloc.spec index 127a014..5abde19 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -38,8 +38,8 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.5 -Release: 3%{?dist} +Version: 5.6 +Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -374,6 +374,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Mon Oct 07 2024 Pavel Raiskup - 5.6-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.6 + * Fri Jul 19 2024 Fedora Release Engineering - 5.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 30218a2..1911cc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.5.tar.gz) = d555ab49825a238d6e06ab8feadb3dbac6bae5bede3b38aedcbf433001b9c9a2dfd27f6fadab7d3c9471ff1996e60e6a5124ef2da1ec51bf5d525244e30b71c7 +SHA512 (resalloc-5.6.tar.gz) = af8e5bff3a824d7d643e5c4c253f4f64f8eb3dfb7927e48f27be10cb91ad1a5b6571d5d2831d05d6a3e648160b34664b703883b2c27035086e54800418f9ef4c From 03060a1dee246c7b966336304fa0bb188bdc73b9 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Fri, 10 Jan 2025 12:42:28 +0100 Subject: [PATCH 59/69] New upstream release --- resalloc.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 5abde19..2c2598d 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -38,7 +38,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.6 +Version: 5.7 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc @@ -374,6 +374,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Fri Jan 10 2025 Jakub Kadlcik - 5.7-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.7 + * Mon Oct 07 2024 Pavel Raiskup - 5.6-1 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.6 diff --git a/sources b/sources index 1911cc5..51ce83a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.6.tar.gz) = af8e5bff3a824d7d643e5c4c253f4f64f8eb3dfb7927e48f27be10cb91ad1a5b6571d5d2831d05d6a3e648160b34664b703883b2c27035086e54800418f9ef4c +SHA512 (resalloc-5.7.tar.gz) = fa4c52d149f770e88016771c560020d3355c9ae71d424533ce3e364c66f6a7b7e3cfdd844541455a782166e244a39f2b0fa0b5b3e8a9310299525efb107c2150 From 6ff47bc8eab705c0f66e468b8a96b94cd71a6b31 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Thu, 16 Jan 2025 14:00:44 +0100 Subject: [PATCH 60/69] New upstream release --- resalloc.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 2c2598d..30c0d9a 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -38,7 +38,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.7 +Version: 5.8 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc @@ -374,6 +374,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Thu Jan 16 2025 Jakub Kadlcik - 5.8-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.8 + * Fri Jan 10 2025 Jakub Kadlcik - 5.7-1 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.7 diff --git a/sources b/sources index 51ce83a..c8e1abe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.7.tar.gz) = fa4c52d149f770e88016771c560020d3355c9ae71d424533ce3e364c66f6a7b7e3cfdd844541455a782166e244a39f2b0fa0b5b3e8a9310299525efb107c2150 +SHA512 (resalloc-5.8.tar.gz) = 9d24465a20978e9b461f90861af92f56d10cc80a5653e9a688a4b24d3dfac2caf0259fd3d0004b6cfeb367aea7a07bedc02ab4f06efab57a6aff5d280641ba68 From 6bfef927deaacb4a41e149daf2695814bcfcd1a1 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sat, 18 Jan 2025 20:57:59 +0100 Subject: [PATCH 61/69] New upstream release Version: 5.9-1 --- resalloc.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 30c0d9a..fe9bf5c 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -38,7 +38,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.8 +Version: 5.9 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc @@ -374,6 +374,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Sat Jan 18 2025 Pavel Raiskup - 5.9-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.9 + * Thu Jan 16 2025 Jakub Kadlcik - 5.8-1 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.8 diff --git a/sources b/sources index c8e1abe..21c360d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.8.tar.gz) = 9d24465a20978e9b461f90861af92f56d10cc80a5653e9a688a4b24d3dfac2caf0259fd3d0004b6cfeb367aea7a07bedc02ab4f06efab57a6aff5d280641ba68 +SHA512 (resalloc-5.9.tar.gz) = 270c7a5d080fd8a2bfaddafb6f220e3749e70367494f6e10861bebf1c5a8f93d965ec1393b3baec1037591dec15a1769a4d29132b1f340259fa60e4d8143d4dc From d80af559156bf4664ed7d87eecc46b08219c0e57 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sat, 18 Jan 2025 21:01:30 +0100 Subject: [PATCH 62/69] releng: no more f39 releases --- build-and-update-all-branches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-and-update-all-branches b/build-and-update-all-branches index 04b3544..502bf7c 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -3,7 +3,7 @@ # Prepare main branch, review the list of branches below and then execute this # script. -branches='main f41 f40 f39 epel8 epel9' +branches='main f41 f40 epel8 epel9' exit_handler () { From 0e203a5774b20b24d946d16ef42f58a7f8378d8c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 5 Jun 2025 08:12:25 +0200 Subject: [PATCH 63/69] Rebuilt for Python 3.14 --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index fe9bf5c..5320ed1 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -39,7 +39,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -374,6 +374,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Thu Jun 05 2025 Python Maint - 5.9-2 +- Rebuilt for Python 3.14 + * Sat Jan 18 2025 Pavel Raiskup - 5.9-1 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.9 From 2758a259369820be91c3ce342af42289ffb71034 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 12 Jun 2025 13:12:32 +0200 Subject: [PATCH 64/69] New upstream release Version: 5.10-1 --- build-and-update-all-branches | 20 +++++++--------- resalloc.spec | 45 +++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 51 insertions(+), 16 deletions(-) diff --git a/build-and-update-all-branches b/build-and-update-all-branches index 502bf7c..9d7b6da 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -1,13 +1,14 @@ #! /bin/sh -# Prepare main branch, review the list of branches below and then execute this +# Prepare rawhide branch, review the list of branches below and then execute this # script. -branches='main f41 f40 epel8 epel9' +main=main +branches="$main epel8 epel9 f41 f42" exit_handler () { - git checkout main + git checkout $main } trap exit_handler EXIT @@ -19,21 +20,18 @@ koji hello tasks= for branch in $branches; do - if test $branch != main; then + if test $branch != $main; then git checkout "$branch" - git merge main + git merge $main fi git push - skip_nvr_check= - if test $branch = epel7; then - skip_nvr_check=--skip-nvr-check - fi - tasks="${tasks}`fedpkg build $skip_nvr_check --nowait | grep 'Created task' | cut -d: -f2`" + tasks="${tasks}`fedpkg build --nowait | grep 'Created task' | cut -d: -f2`" done if test -n "$tasks"; then koji watch-task $tasks fi -git checkout main +set -- $branches +git checkout $1 fedpkg update diff --git a/resalloc.spec b/resalloc.spec index 5320ed1..7ddaa30 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -33,13 +33,25 @@ the purposes of CI/CD tasks. %bcond_with python3 %endif +# Modern distributions (using RPM v4.19+; for example, Fedora 39+) do not +# require the %%pre scriptlet for creating users/groups because the sysusers +# feature is now built directly into RPM. Simply including the sysusers +# `mock.conf` file in a package payload is sufficient to leverage this feature. +# However, for older distributions that lack this capability, we still define +# the %%pre scriptlet. +%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?mageia} && 0%{?mageia} < 10) || (0%{?suse_version} && 0%{?suse_version} < 1660) +%bcond_without sysusers_compat +%else +%bcond_with sysusers_compat +%endif + %global default_python %{?with_python3:python3}%{!?with_python3:python2} %global default_sitelib %{?with_python3:%python3_sitelib}%{!?with_python3:%python_sitelib} Name: %srcname Summary: %sum - client tooling -Version: 5.9 -Release: 2%{?dist} +Version: 5.10 +Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -82,6 +94,10 @@ BuildRequires: python-yaml Requires: %default_python-%srcname = %version-%release +%if %{with sysusers_compat} +Requires(pre): shadow-utils +%endif + Source0: https://github.com/praiskup/%name/releases/download/v%version/%name-%version.tar.gz Source1: resalloc.service Source5: resalloc-agent-spawner.service @@ -116,7 +132,6 @@ Requires: python-sqlalchemy Requires: python-yaml %endif -Requires(pre): /usr/sbin/useradd %description server %desc @@ -156,7 +171,6 @@ it shows page with information about resalloc resources. %package agent-spawner Summary: %sum - daemon starting agent-like resources -Requires(pre): /usr/sbin/useradd Requires: python3-copr-common >= 0.23 Requires: python3-daemon Requires: python3-redis @@ -219,6 +233,16 @@ restorecon -R %_var/www/cgi-%{name} || : rm -r resalloc_agent_spawner %endif +# Create sysusers.d config files +cat >resalloc.sysusers.conf <resalloc-agent-spawner.sysusers.conf < - 5.10-1 +- new upstream release, packages use RPM built-in sysusers support: + https://github.com/praiskup/resalloc/releases/tag/v5.10 + * Thu Jun 05 2025 Python Maint - 5.9-2 - Rebuilt for Python 3.14 diff --git a/sources b/sources index 21c360d..8e39ac1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.9.tar.gz) = 270c7a5d080fd8a2bfaddafb6f220e3749e70367494f6e10861bebf1c5a8f93d965ec1393b3baec1037591dec15a1769a4d29132b1f340259fa60e4d8143d4dc +SHA512 (resalloc-5.10.tar.gz) = a8116bd663ffe75c5322c929dd0609569dfe6a0e8efe6c9fdebcd81882d99f6c077fb6a0b260ceae074f4994eb86d9c93a9f22b68251c39e7b8e29c4c5797e34 From e065fd3c642144f3a36a806059d8312a1a8ec58b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 21 Jul 2025 15:29:22 +0200 Subject: [PATCH 65/69] New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.11 --- resalloc.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 7ddaa30..96a3adf 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -50,7 +50,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.10 +Version: 5.11 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc diff --git a/sources b/sources index 8e39ac1..f458908 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.10.tar.gz) = a8116bd663ffe75c5322c929dd0609569dfe6a0e8efe6c9fdebcd81882d99f6c077fb6a0b260ceae074f4994eb86d9c93a9f22b68251c39e7b8e29c4c5797e34 +SHA512 (resalloc-5.11.tar.gz) = 73becebe671a59912006eb4b227c10f6ac7be91a91e94cff470ac6bb32eb4447ec905b1d151c5eeb54fdc6c2a6179f9b7d606bcf25c3f9caeb63bde171759ac3 From 6c799be7e51a3f460a5f80bbc9e35543841be095 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 21 Jul 2025 15:37:35 +0200 Subject: [PATCH 66/69] Forgotten changelog entry --- resalloc.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resalloc.spec b/resalloc.spec index 96a3adf..5d19b70 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -407,6 +407,10 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Mon Jul 21 2025 Pavel Raiskup - 5.11-1 +- new upstream release, don't keep cleanup processes indefinitely: + https://github.com/praiskup/resalloc/releases/tag/v5.11 + * Thu Jun 12 2025 Pavel Raiskup - 5.10-1 - new upstream release, packages use RPM built-in sysusers support: https://github.com/praiskup/resalloc/releases/tag/v5.10 From 9b7713aa1fd75a29b8b8ef1a30fcf156ffa6384a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 11:54:41 +0000 Subject: [PATCH 67/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 5d19b70..9810bb0 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -51,7 +51,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -407,6 +407,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 21 2025 Pavel Raiskup - 5.11-1 - new upstream release, don't keep cleanup processes indefinitely: https://github.com/praiskup/resalloc/releases/tag/v5.11 From bd93fdb44c6ca9449c56f1b3eb27977a83024246 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:15:37 +0200 Subject: [PATCH 68/69] Rebuilt for Python 3.14.0rc2 bytecode --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 9810bb0..ff5c4d2 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -51,7 +51,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -407,6 +407,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Fri Aug 15 2025 Python Maint - 5.11-3 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 5.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c46cbb5e81d436341d773ca988012b89851380cb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:53:02 +0200 Subject: [PATCH 69/69] Rebuilt for Python 3.14.0rc3 bytecode --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index ff5c4d2..7093616 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -51,7 +51,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.11 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -407,6 +407,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Fri Sep 19 2025 Python Maint - 5.11-4 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 5.11-3 - Rebuilt for Python 3.14.0rc2 bytecode