From 9f10a855db20855213102715d9e4320e339191e7 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Feb 21 2024 17:03:07 +0000 Subject: Set CS10 and RHEL10 to latest --- diff --git a/src/centpkg/cli.py b/src/centpkg/cli.py index 27d25e6..3ded511 100755 --- a/src/centpkg/cli.py +++ b/src/centpkg/cli.py @@ -252,31 +252,36 @@ class centpkgClient(cliClient): self.log.info("Checking rhel-target information:") stream_version = self.cmd.target.split('-')[0] rhel_version = centpkg.utils.stream_mapping(stream_version) - try: - active_y, in_stabilization = centpkg.utils.determine_active_y_version(rhel_version, pp_api_url) - except AssertionError as e: - self.log.error(" Error: centpkg cannot determine the development phase.") - self.log.error(" Please file an issue at https://git.centos.org/centos/centpkg") - self.log.error(" Workaround: Use the --rhel-target option") - self.log.error("Exiting") - raise SystemExit(1) - divergent_branch = centpkg.utils.does_divergent_branch_exist( - self.cmd.repo_name, - rhel_version, - active_y, - rhel_dist_git, - pp_api_url, - "rpms") - # Good to know - if divergent_branch : - self.log.info(" a divergent branch was found.") - else: - self.log.info(" a divergent branch was not found.") - if in_stabilization : - self.log.info(" we are in stabilization mode.") + # Until RHEL 10.1 is starting, set 10 to latest, by setting divergent_branch to True + if stream_version == "c10s" or rhel_version == "rhel-10": + divergent_branch = True else: - self.log.info(" we are not in stabilization mode.") + try: + active_y, in_stabilization = centpkg.utils.determine_active_y_version(rhel_version, pp_api_url) + except AssertionError as e: + self.log.error(" Error: centpkg cannot determine the development phase.") + self.log.error(" Please file an issue at https://git.centos.org/centos/centpkg") + self.log.error(" Workaround: Use the --rhel-target option") + self.log.error("Exiting") + raise SystemExit(1) + divergent_branch = centpkg.utils.does_divergent_branch_exist( + self.cmd.repo_name, + rhel_version, + active_y, + rhel_dist_git, + pp_api_url, + "rpms") + + # Good to know + if divergent_branch : + self.log.info(" a divergent branch was found.") + else: + self.log.info(" a divergent branch was not found.") + if in_stabilization : + self.log.info(" we are in stabilization mode.") + else: + self.log.info(" we are not in stabilization mode.") # Update args.custom_user_metadata if hasattr(self.args, 'custom_user_metadata') and self.args.custom_user_metadata: