Skip to content

Commit

Permalink
Skip subctl download during deployment in case of downstream unreleased
Browse files Browse the repository at this point in the history
Signed-off-by: Shylesh Kumar Mohan <[email protected]>
  • Loading branch information
shylesh committed Jan 1, 2025
1 parent faed0b2 commit ff2716a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions ocs_ci/deployment/acm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion ocs_ci/ocs/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -2703,7 +2703,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"
)
SUBMARINER_BREW = "brew.registry.redhat.io/rh-osbs"
SUBMARINER_BREW_REPO = "/".join([SUBMARINER_BREW, "iib"])
Expand Down

0 comments on commit ff2716a

Please sign in to comment.