From c7fbe1a364f6416f534858e8aa6fc28377b26162 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Wed, 20 Mar 2024 09:40:13 +0100 Subject: [PATCH] Release 0.15 - Update VERSION to 0.15 - Document release process - Add more description text Signed-off-by: Christian Heimes --- DEVELOPMENT.md | 23 +++++++++++++++++++++++ Makefile | 2 +- ipa-hcc.spec.rpkg | 11 +++++++---- pyproject.toml | 2 +- setup.cfg | 2 +- src/ipahcc/hccplatform.py | 2 +- src/ipahcc_auto_enrollment.py | 2 +- src/ipahcc_client_prepare.py | 2 +- src/ipahcc_stage_console.py | 2 +- 9 files changed, 37 insertions(+), 11 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index cc31d71..6b6197c 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -324,3 +324,26 @@ the server and then running `./install_server.sh` on the server. package show `HCC organization id`, `HCC subscription id`, and `RHSM certificate subject` with same values as the RHSM cert. The subject string does not contain spaces. + + +## Release process + +1. Bump `VERSION` in `Makefile`, e.g. `VERSION = 0.99` +2. Run `make version` to update `VERSION` in other files. It should modify + `pyproject.toml`, `setup.cfg`, and four `.py` files. +3. Commit the changes, e.g. `git commit --signoff -m "Release 0.99"` +4. Push the changes and merge them into `main` +5. Pull the release commit into your local checkout. + > **IMPORTANT:** Your clone must be on `main` branch and the tip of your + local `main` branch must be the release commit. Otherwise `rpkg` may + not work as expected. +6. Create a release tag with `rpkg tag --version 0.99`. Adjust the text + before you close your `$EDITOR`. The text will be used in RPM changelog. + This will create a tag like `ipa-hcc-0.99-1`. +7. Verify the tag with `git tag -v ipa-hcc-0.99-1`. The `Commits:` range + should end at the current release commit. +8. Push the tag to upstream repo + `git push upstream refs/tags/ipa-hcc-0.99-1`. This will trigger a COPR + build, too. +9. On [GitHub](https://github.com/podengo-project/ipa-hcc/tags), turn the + tag into a release. diff --git a/Makefile b/Makefile index faeed22..0441689 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 0.14 +VERSION = 0.15 RPM_WITH = client mockapi stageconsole RPM_WITHOHT = diff --git a/ipa-hcc.spec.rpkg b/ipa-hcc.spec.rpkg index 5a62437..472b16c 100644 --- a/ipa-hcc.spec.rpkg +++ b/ipa-hcc.spec.rpkg @@ -112,7 +112,7 @@ An extension for IPA integration with Red Hat Hybrid Cloud Console. %if %{with server} %package server -Summary: Server plugin for IPA Hybrid Cloud Console extension +Summary: IPA server plugin for Hybrid Cloud Console integration BuildArch: noarch %py_provides python3-ipahcc @@ -131,8 +131,10 @@ Requires(post): selinux-policy %{?systemd_requires} %description server -This package contains server plugins and WebUI for IPA Hybrid Cloud Console -extension. +This package contains IPA server plugins, LDAP schema extension, WebUI +extension, and registration agent for Hybrid Cloud Console integration. The +extensions require an account on https://console.redhat.com/ and registration +with subscription manager. %posttrans server %{python3} -c "import sys; from ipaserver.install import installutils; sys.exit(0 if installutils.is_ipa_configured() else 1);" > /dev/null 2>&1 @@ -271,7 +273,8 @@ Recommends: insights-client %{?systemd_requires} %description client -This package contains the automatic enrollment service for IPA clients. +This package contains the automatic enrollment service for IPA clients +(domain join on launch). %post client %systemd_post ipa-hcc-auto-enrollment.service diff --git a/pyproject.toml b/pyproject.toml index c6cb591..be96ee2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "ipahcc" -version = "0.14" +version = "0.15" description = "IPA enrollment agent for Red Hat Hybrid Cloud Console" readme = "README.md" authors = [ diff --git a/setup.cfg b/setup.cfg index 3e42ca8..4d58b9c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ # setup.cfg for backwards compatibility with setuptools on Python 3.6 [metadata] name = ipahcc -version = 0.14 +version = 0.15 description = IPA enrollment agent for Red Hat Hybrid Cloud Console long_description = file: README.md long_description_content_type = text/markdown diff --git a/src/ipahcc/hccplatform.py b/src/ipahcc/hccplatform.py index 094cd56..72d1a83 100644 --- a/src/ipahcc/hccplatform.py +++ b/src/ipahcc/hccplatform.py @@ -21,7 +21,7 @@ logger = logging.getLogger(__name__) # version is updated by Makefile -VERSION = "0.14" +VERSION = "0.15" # common HTTP request headers HTTP_HEADERS = { diff --git a/src/ipahcc_auto_enrollment.py b/src/ipahcc_auto_enrollment.py index 60236e1..2ecce12 100644 --- a/src/ipahcc_auto_enrollment.py +++ b/src/ipahcc_auto_enrollment.py @@ -39,7 +39,7 @@ FQDN = socket.gethostname() # version is updated by Makefile -VERSION = "0.14" +VERSION = "0.15" # copied from ipahcc.hccplatform DEVELOPMENT_MODE = True diff --git a/src/ipahcc_client_prepare.py b/src/ipahcc_client_prepare.py index cc61d68..fcaaee2 100644 --- a/src/ipahcc_client_prepare.py +++ b/src/ipahcc_client_prepare.py @@ -27,7 +27,7 @@ from ipapython.version import VENDOR_VERSION as IPA_VERSION # version is updated by Makefile -VERSION = "0.14" +VERSION = "0.15" HCCCONF_URI = "_hccconf.podengo-project.internal." RHSM_CERT = "/etc/pki/consumer/cert.pem" diff --git a/src/ipahcc_stage_console.py b/src/ipahcc_stage_console.py index e22776b..2b5bcb9 100644 --- a/src/ipahcc_stage_console.py +++ b/src/ipahcc_stage_console.py @@ -17,7 +17,7 @@ import subprocess # version is updated by Makefile -VERSION = "0.14" +VERSION = "0.15" RHSM_CONF = pathlib.Path("/etc/rhsm/rhsm.conf") RHSM_SERVER_HOSTNAME = "subscription.rhsm.{suffix}"