diff --git a/ocs_ci/deployment/acm.py b/ocs_ci/deployment/acm.py index 96aa8d491cb..13747bdb4d7 100644 --- a/ocs_ci/deployment/acm.py +++ b/ocs_ci/deployment/acm.py @@ -86,8 +86,11 @@ def __init__(self): self.dr_only_list = [] def deploy(self): - # Download subctl binary in any case. - self.download_binary() + # Download subctl binary in any case except downstream unreleased. + if not ( + self.source == "downstream" and self.submariner_release_type == "unreleased" + ): + self.download_binary() if self.source == "upstream": self.deploy_upstream() elif self.source == "downstream": @@ -173,7 +176,7 @@ def get_submariner_csv_version(self): """ csv_version_cmd = ( "oc get submariners.submariner.io -n submariner-operator " - "submariner -o jsonpath='{{.status.gateways[0].version}}'" + "submariner -o jsonpath='{.status.gateways[0].version}'" ) return run_cmd(csv_version_cmd) @@ -201,10 +204,10 @@ def download_downstream_binary(self): UnsupportedPlatformError : If current platform has no supported subctl binary """ if self.submariner_release_type == "unreleased": - subctl_ver = self.get_submariner_csv_version() + version_str = self.get_submariner_csv_version() else: subctl_ver = config.ENV_DATA["subctl_version"] - version_str = subctl_ver.split(":")[1] + version_str = subctl_ver.split(":")[1] pull_secret_path = os.path.join(constants.DATA_DIR, "pull-secret") processor = platform.processor() arch = platform.machine() @@ -217,7 +220,7 @@ def download_downstream_binary(self): "Not a supported architecture for subctl binary" ) if self.submariner_release_type == "unreleased": - unreleased_tag = self.get_submariner_unreleased_tag(subctl_ver) + unreleased_tag = self.get_submariner_unreleased_tag(version_str) brew_url = "/".join([constants.SUBMARINER_BREW, "rhacm2-subctl-rhel9:"]) cmd = ( f"oc image extract --filter-by-os linux/{binary_pltfrm} " diff --git a/ocs_ci/ocs/constants.py b/ocs_ci/ocs/constants.py index 3cfe52b3ccb..2e7e573ab17 100644 --- a/ocs_ci/ocs/constants.py +++ b/ocs_ci/ocs/constants.py @@ -2721,7 +2721,7 @@ SUBMARINER_DOWNSTREAM_UNRELEASED_BUILD_URL = ( "https://datagrepper.engineering.redhat.com/raw?topic=/topic/" "VirtualTopic.eng.ci.redhat-container-image.pipeline.complete" - "&rows_per_page=25&delta=1296000&contains=submariner-operator-bundle-container-v" + "&rows_per_page=25&delta=12960000&contains=submariner-operator-bundle-container-v" ) ACM_BREW_BUILD_URL = ( "https://datagrepper.engineering.redhat.com/raw?topic=/topic/"