Skip to content

fix(e2e): enable user provisioning on the E2E test instances during deploy #1380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dylan-openhands merged 1 commit into from
Oct 10, 2026
Merged

fix(e2e): enable user provisioning on the E2E test instances during deploy #1380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions scripts/replicated_deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,12 @@ else
done
[ -n "$META" ] || fail "upgrade service never came up"

# --- config: read values, write them straight back -----------------------
# --- config: read values, write them back --------------------------------
# These instances exist for the E2E suite. Its org specs provision users via
# the endpoint that oem_user_creation_flow_enabled registers (off by default).
if [ "$(jq -r .isConfigurable <<<"$META")" = true ]; then
TMO=60 api "$UP/config" | jq -c '{configGroups}' >/tmp/cfg.json
TMO=60 api "$UP/config" | jq -c '{configGroups}
| (.configGroups[]?.items[]? | select(.name == "oem_user_creation_flow_enabled") | .value) = "1"' >/tmp/cfg.json
R="$(retry_gateway PUT --data-binary @/tmp/cfg.json "$UP/config" || true)"
ok <<<"$R" || fail "config rejected: $(why <<<"$R") — new release likely added a required item with no default"
fi
Expand Down
20 changes: 19 additions & 1 deletion scripts/test_replicated_deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ def reply(self, code, obj):

def do_PUT(self):
state["config_paths"].append(self.path)
n = int(self.headers.get("Content-Length") or 0)
state["config_bodies"].append(json.loads(self.rfile.read(n) or b"null"))
total = len(state["config_paths"])
if state["config_502_then"] and total <= state["config_502_then"]:
return self.reply(502, None)
Expand Down Expand Up @@ -102,6 +104,8 @@ def do_GET(self):
res = {"results": [{"isPass": not strict, "title": "mem"}]}
return self.reply(200, {"preflightResult": {
"result": json.dumps(res), "hasFailingStrictPreflights": strict}})
if p.endswith("/upgrade-service/app/openhands/config"):
return self.reply(200, {"configGroups": state["config_groups"]})
if "/task/upgrade-service" in p:
return self.reply(200, {"status": ""})
if p.endswith("/upgrade-service/app/openhands"):
Expand All @@ -121,7 +125,8 @@ def kots():
"placeholders": 0, "strict_fail": False, "deploy_status": 200,
"deploy_body": None, "deploy_502_then": 0, "deploy_paths": [],
"config_status": 200, "config_body": None, "config_502_then": 0,
"config_paths": [], "boot_status": 200, "boot_body": None,
"config_paths": [], "config_bodies": [], "config_groups": None,
"boot_status": 200, "boot_body": None,
"boot_502_then": 0, "boot_paths": [], "apps_status": 200,
"configurable": False, "apps_fail_after_deploy": False,
"apps_dark": False, "current_status": "deployed", "extra_env": {}}
Expand Down Expand Up @@ -265,6 +270,19 @@ def test_a_transient_502_on_the_config_put_is_retried(kots):
assert kots["deploy_paths"], "a retried config must not block the deploy"


def test_the_config_write_back_enables_user_provisioning_and_keeps_other_values(kots):
"""The E2E org specs call the provision-user endpoint, which this item registers."""
kots["configurable"] = True
kots["config_groups"] = [{"name": "oem", "items": [
{"name": "oem_user_creation_flow_enabled", "value": "", "default": "0"},
{"name": "other_item", "value": "kept", "default": ""}]}]
r = kots["run"]()
assert r.returncode == 0, r.stderr
assert kots["config_bodies"][-1] == {"configGroups": [{"name": "oem", "items": [
{"name": "oem_user_creation_flow_enabled", "value": "1", "default": "0"},
{"name": "other_item", "value": "kept", "default": ""}]}]}


def test_a_transient_502_on_booting_the_upgrade_service_is_retried(kots):
"""start-upgrade-service goes through the same gateway restart window."""
kots["boot_502_then"] = 1
Expand Down
Loading