Skip to content

Commit

Permalink
Merge branch 'master' into feature/vllm-metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
lugi0 authored May 15, 2024
2 parents 35a624e + e22ef41 commit 4bd037f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ods_ci/libs/Helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def update_notification_email_address(self, cluster_name, email_address, addon_n
@keyword
def convert_to_hours_and_minutes(self, seconds):
"""Converts seconds in hours and minutes"""
m, s = divmod(int(seconds), 60)
m, _ = divmod(int(seconds), 60)
h, m = divmod(m, 60)
return h, m

Expand Down
2 changes: 1 addition & 1 deletion ods_ci/utils/scripts/ocm/ocm.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ def add_machine_pool(self):
if bool(self.reuse_machine_pool) and self.check_if_machine_pool_exists():
log.info(f"MachinePool with name {self.pool_name} exists in cluster {self.cluster_name}. Hence reusing it")
else:
cluster_id = self.get_osd_cluster_id()
self.get_osd_cluster_id()
cmd = "ocm --v={} create machinepool --cluster {} --instance-type {} --replicas {} --taints {} {}".format(
self.ocm_verbose_level,
self.cluster_id,
Expand Down
4 changes: 2 additions & 2 deletions ods_ci/utils/scripts/terraform/openstack/provision.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def create_instance(self):
},
)
tf.init()
ret, out, err = tf.apply(
ret, _, err = tf.apply(
no_color=IsFlagged,
input=False,
refresh=False,
Expand All @@ -77,7 +77,7 @@ def delete_instance(self):
},
)
tf.init()
ret, out, err = tf.destroy(
ret, _, err = tf.destroy(
capture_output="yes",
no_color=IsNotFlagged,
force=IsNotFlagged,
Expand Down
1 change: 0 additions & 1 deletion ods_ci/utils/scripts/testconfig/generateTestConfigFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ def get_dashboard_url():
"""
Get dashboard url for the open data science.
"""
host_jsonpath = "{.spec.host}"
cmd = "oc get route -A -o json | jq '.items[].spec.host' | grep 'dashboard'"

dashboard_url = execute_command(cmd)
Expand Down
4 changes: 2 additions & 2 deletions ods_ci/utils/scripts/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def clone_config_repo(**kwargs):
shutil.rmtree(kwargs["repo_dir"])
os.makedirs(kwargs["repo_dir"])
print("git repo dir '%s' created successfully" % kwargs["repo_dir"])
except OSError as error:
except OSError:
print("git repo dir '%s' can not be created." % kwargs["repo_dir"])
return False

Expand All @@ -49,7 +49,7 @@ def read_yaml(filename):
try:
with open(filename, "r") as fh:
return yaml.safe_load(fh)
except OSError as error:
except OSError:
return None


Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ ignore = [
# TODO
"B006", # Do not use mutable data structures for argument defaults
"COM812", # Trailing comma missing
"F841", # Local variable `response` is assigned to but never used
"INP001", # File `ods_ci/tests/Resources/Page/ODH/JupyterHub/jupyter-helper.py` is part of an implicit namespace package. Add an `__init__.py`.
"N806", # Variable `outputText` in function should be lowercase
"N813", # Camelcase `ElementTree` imported as lowercase `et`
Expand Down

0 comments on commit 4bd037f

Please sign in to comment.