Skip to content

Commit

Permalink
Merge branch 'main' into yaml_config_sets
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam-D-Lewis authored Dec 12, 2024
2 parents 6ebdbdb + e34612c commit 3613a09
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test_local_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ jobs:
with:
workloads: "" # all
namespace: "dev"
timeout: 60
max-restarts: 0
timeout: 300
max-restarts: 3

### DEPLOYMENT TESTS
- name: Deployment Pytests
Expand Down
2 changes: 1 addition & 1 deletion tests/tests_unit/test_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def mock_input(prompt, **kwargs):
return "y"
elif (
prompt
== "[bold]Would you like Nebari to assign the corresponding role to all of your current groups automatically?[/bold]"
== "[bold]Would you like Nebari to assign the corresponding role/scopes to all of your current groups automatically?[/bold]"
):
return "N"
# All other prompts will be answered with "y"
Expand Down

0 comments on commit 3613a09

Please sign in to comment.