Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6572becc59 | ||
|
|
94a858d8ef | ||
|
|
57393c933c | ||
|
|
45898cc4e2 |
@@ -17,3 +17,7 @@
|
||||
state: str # 'Active' or 'Pause'
|
||||
pipeline: Dict[str, Any]
|
||||
|
||||
|
||||
|
||||
|
||||
fdsf
|
||||
@@ -45,10 +45,10 @@ deployDocker = DockerSwarmDeploy(
|
||||
docker_compose_path="docker-compose.yml",
|
||||
)
|
||||
|
||||
checkPing = UrlCheck(
|
||||
url="https://brencher.rudolf.keenetic.link/state",
|
||||
expected=checkPingF,
|
||||
)
|
||||
#checkPing = UrlCheck(
|
||||
# url="https://brencher.rudolf.keenetic.link/state",
|
||||
# expected=checkPingF,
|
||||
#)
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://brencher.rudolf.keenetic.link/",
|
||||
@@ -68,7 +68,7 @@ brencher = Environment(
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
checkPing,
|
||||
# checkPing,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
|
||||
@@ -72,10 +72,10 @@ deployDocker = DockerSwarmDeploy(
|
||||
docker_compose_path="docker-compose.yml",
|
||||
)
|
||||
|
||||
checkPing = UrlCheck(
|
||||
url="https://brencher.rudolf.keenetic.link/state",
|
||||
expected=checkPingF,
|
||||
)
|
||||
#checkPing = UrlCheck(
|
||||
# url="https://brencher.rudolf.keenetic.link/state",
|
||||
# expected=checkPingF,
|
||||
#)
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://brencher.rudolf.keenetic.link/",
|
||||
@@ -98,7 +98,7 @@ brencher2 = Environment(
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
checkPing,
|
||||
# checkPing,
|
||||
logUrls
|
||||
],
|
||||
)
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
from enironment import Environment
|
||||
from steps.checks import SimpleLog, UrlCheck
|
||||
from steps.docker import DockerSwarmCheck, DockerSwarmDeploy
|
||||
from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
from steps.shared_state import SharedStateHolderInMemory
|
||||
|
||||
clone = GitClone(url="https://github.com/rudolf1/uber_backup.git", branchNamePrefix="ansible")
|
||||
|
||||
dockerSwarmCheck = DockerSwarmCheck(
|
||||
stack_name="gitea",
|
||||
)
|
||||
unmerge = GitUnmerge(clone, dockerSwarmCheck)
|
||||
|
||||
state = SharedStateHolderInMemory(unmerge=unmerge)
|
||||
|
||||
checkoutMerged = CheckoutMerged(clone,
|
||||
desired_branches=state,
|
||||
push=False,
|
||||
git_user_email="rudolfss13@gmail.com",
|
||||
git_user_name="brencher_bot"
|
||||
)
|
||||
|
||||
deployDocker = DockerSwarmDeploy(
|
||||
wd=clone,
|
||||
buildDocker=None,
|
||||
stackChecker=dockerSwarmCheck,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version,
|
||||
},
|
||||
stack_name="gitea",
|
||||
docker_compose_path="poc/gitea/stack-compose.yml",
|
||||
)
|
||||
|
||||
# checkPing1 = UrlCheck(
|
||||
# url="http://100.70.193.97:8087/api/status",
|
||||
# expected=lambda obj: obj['gateway_running'] == 'true' and obj['auth_required'] == 'true',
|
||||
# )
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://gitea.rudolf.keenetic.link",
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
__all__ = ["gitea"]
|
||||
gitea = Environment(
|
||||
id="gitea",
|
||||
state=state,
|
||||
pipeline=[
|
||||
clone,
|
||||
state,
|
||||
checkoutMerged,
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
# checkPing1,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,59 @@
|
||||
from enironment import Environment
|
||||
from steps.checks import SimpleLog, UrlCheck
|
||||
from steps.docker import DockerSwarmCheck, DockerSwarmDeploy
|
||||
from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
from steps.shared_state import SharedStateHolderInMemory
|
||||
|
||||
clone = GitClone(url="https://github.com/rudolf1/uber_backup.git", branchNamePrefix="ansible")
|
||||
|
||||
dockerSwarmCheck = DockerSwarmCheck(
|
||||
stack_name="hermes",
|
||||
)
|
||||
unmerge = GitUnmerge(clone, dockerSwarmCheck)
|
||||
|
||||
state = SharedStateHolderInMemory(unmerge=unmerge)
|
||||
|
||||
checkoutMerged = CheckoutMerged(clone,
|
||||
desired_branches=state,
|
||||
push=False,
|
||||
git_user_email="rudolfss13@gmail.com",
|
||||
git_user_name="brencher_bot"
|
||||
)
|
||||
|
||||
deployDocker = DockerSwarmDeploy(
|
||||
wd=clone,
|
||||
buildDocker=None,
|
||||
stackChecker=dockerSwarmCheck,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version,
|
||||
},
|
||||
stack_name="hermes",
|
||||
docker_compose_path="poc/hermes/stack-compose.yml",
|
||||
)
|
||||
|
||||
checkPing1 = UrlCheck(
|
||||
url="http://100.70.193.97:8087/api/status",
|
||||
expected=lambda obj: obj['gateway_running'] == 'true' and obj['auth_required'] == 'true',
|
||||
)
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://hermes.rudolf.keenetic.link",
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
__all__ = ["hermes"]
|
||||
hermes = Environment(
|
||||
id="hermes",
|
||||
state=state,
|
||||
pipeline=[
|
||||
clone,
|
||||
state,
|
||||
checkoutMerged,
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
checkPing1,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,73 @@
|
||||
from enironment import Environment
|
||||
from steps.checks import SimpleLog, UrlCheck
|
||||
from steps.docker import DockerComposeBuild, DockerSwarmCheck, DockerSwarmDeploy
|
||||
from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
from steps.shared_state import SharedStateHolderInMemory
|
||||
|
||||
clone = GitClone(url="https://github.com/rudolf1/uber_backup.git", branchNamePrefix="ansible")
|
||||
|
||||
dockerSwarmCheck = DockerSwarmCheck(
|
||||
stack_name="hermes_infra",
|
||||
)
|
||||
unmerge = GitUnmerge(clone, dockerSwarmCheck)
|
||||
|
||||
state = SharedStateHolderInMemory(unmerge=None)
|
||||
|
||||
checkoutMerged = CheckoutMerged(clone,
|
||||
desired_branches=state,
|
||||
push=False,
|
||||
git_user_email="rudolfss13@gmail.com",
|
||||
git_user_name="brencher_bot"
|
||||
)
|
||||
|
||||
buildDocker = DockerComposeBuild(clone,
|
||||
docker_repo_username="",
|
||||
docker_repo_password="",
|
||||
docker_compose_path="hermes_squid/stack-compose.yml",
|
||||
docker_repo_url="https://registry.rudolf.keenetic.link",
|
||||
publish=False,
|
||||
build_cache = True,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version,
|
||||
# "user_group": "1000:137"
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
deployDocker = DockerSwarmDeploy(
|
||||
wd=clone,
|
||||
buildDocker=buildDocker,
|
||||
stackChecker=dockerSwarmCheck,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version,
|
||||
},
|
||||
stack_name="hermes_infra",
|
||||
docker_compose_path="hermes_squid/stack-compose.yml",
|
||||
)
|
||||
|
||||
# checkPing1 = UrlCheck(
|
||||
# url="http://100.70.193.97:8088/api/status",
|
||||
# expected=lambda obj: obj['gateway_running'] == 'true' and obj['auth_required'] == 'true',
|
||||
# )
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://hermes.rudolf.keenetic.link",
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
__all__ = ["hermes_infra"]
|
||||
hermes_infra = Environment(
|
||||
id="hermes_infra",
|
||||
state=state,
|
||||
pipeline=[
|
||||
clone,
|
||||
state,
|
||||
checkoutMerged,
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
# checkPing1,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
@@ -31,10 +31,10 @@ deployDocker = DockerSwarmDeploy(
|
||||
docker_compose_path="poc/immich/stack-compose.yml",
|
||||
)
|
||||
|
||||
checkPing = UrlCheck(
|
||||
url="https://immich.rudolf.keenetic.link/api/server/ping",
|
||||
expected={"res": "pong"},
|
||||
)
|
||||
#checkPing = UrlCheck(
|
||||
# url="https://immich.rudolf.keenetic.link/api/server/ping",
|
||||
# expected={"res": "pong"},
|
||||
#)
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://immich.rudolf.keenetic.link",
|
||||
@@ -52,7 +52,7 @@ immich = Environment(
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
checkPing,
|
||||
# checkPing,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
|
||||
@@ -279,8 +279,8 @@ class DockerSwarmDeploy(AbstractStep[str]):
|
||||
swarmEnv = {k: v for k, v in dotenv_values(os.path.join(os.path.dirname(tmp_compose_path), ".env")).items()
|
||||
if v is not None}
|
||||
# merge_dicts(swarmEnv, env)
|
||||
result = subprocess.run(cmd, capture_output=True, text=True)
|
||||
# , cwd=os.path.dirname(tmp_compose_path), env=swarmEnv)
|
||||
result = subprocess.run(cmd, capture_output=True, text=True, cwd=os.path.dirname(tmp_compose_path))
|
||||
#, env=swarmEnv)
|
||||
os.remove(tmp_compose_path)
|
||||
if result.returncode != 0:
|
||||
logger.error(f"Stack deploy failed: {result.stderr}")
|
||||
|
||||
@@ -42,8 +42,11 @@ class SharedStateHolderInMemory(AbstractStep[SharedState], SharedStateHolder):
|
||||
def progress(self) -> SharedState:
|
||||
if len(self.state.branches) == 0:
|
||||
if self.unmerge:
|
||||
unmerge = self.unmerge.progress()
|
||||
self.state = replace(self.state, branches=unmerge.branches, token=uuid.uuid4().hex)
|
||||
try:
|
||||
unmerge = self.unmerge.progress()
|
||||
self.state = replace(self.state, branches=unmerge.branches, token=uuid.uuid4().hex)
|
||||
except BaseException as e:
|
||||
logger.error("Unmerge failed: %s", e)
|
||||
return self.state
|
||||
|
||||
|
||||
|
||||
+32
-10
@@ -11,7 +11,7 @@ from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.responses import FileResponse
|
||||
|
||||
from app import App
|
||||
from enironment import get_step
|
||||
from enironment import SharedStateConflictError, get_step
|
||||
from utils import custom_json_dumps
|
||||
from processing import reset_caches
|
||||
from secondary import SecondaryManager
|
||||
@@ -129,6 +129,7 @@ class WebApp:
|
||||
|
||||
async def broadcast_environments(self, data: Any) -> None:
|
||||
await self.broadcast("environments", data)
|
||||
await self.broadcast("version", self.get_version())
|
||||
|
||||
async def broadcast_error(self, data: Any) -> None:
|
||||
await self.broadcast("error", data)
|
||||
@@ -140,11 +141,16 @@ class WebApp:
|
||||
|
||||
# --- Routes ---
|
||||
|
||||
def get_version(self) -> str:
|
||||
return os.getenv('VERSION', 'unknown') or 'unknown'
|
||||
|
||||
async def serve_index(self) -> FileResponse:
|
||||
return FileResponse(os.path.join(FRONTEND_DIR, 'index.html'))
|
||||
|
||||
async def serve_state(self) -> Response:
|
||||
return Response(content=custom_json_dumps(self.get_global_envs_to_emit()), media_type="application/json")
|
||||
state = self.get_global_envs_to_emit()
|
||||
state['version'] = self.get_version()
|
||||
return Response(content=custom_json_dumps(state), media_type="application/json")
|
||||
|
||||
async def serve_branches_route(self) -> Response:
|
||||
return Response(content=custom_json_dumps(self.get_global_branches_to_emit()), media_type="application/json")
|
||||
@@ -163,6 +169,8 @@ class WebApp:
|
||||
# Send initial state on connect and record it so duplicate broadcasts are suppressed
|
||||
branches_payload = custom_json_dumps({"branches": self.get_global_branches_to_emit()})
|
||||
envs_payload = custom_json_dumps({"environments": self.get_global_envs_to_emit()})
|
||||
version_payload = custom_json_dumps({"version": self.get_version()})
|
||||
await websocket.send_text(version_payload)
|
||||
await websocket.send_text(branches_payload)
|
||||
self.ws_connections[websocket]["branches"] = branches_payload
|
||||
await websocket.send_text(envs_payload)
|
||||
@@ -186,14 +194,28 @@ class WebApp:
|
||||
elif id in self.core.environments.keys():
|
||||
env = self.core.environments.get(id, None)
|
||||
expected_token = update_data.get('token', '')
|
||||
if 'branches' in update_data:
|
||||
if not env:
|
||||
raise RuntimeError(f"Unknown env {update_data.get('id', '')}")
|
||||
env.state.set_branches(update_data.get('branches', []), expected_token=expected_token)
|
||||
if 'dry' in update_data:
|
||||
if not env:
|
||||
raise RuntimeError(f"Unknown env {update_data.get('id', '')}")
|
||||
env.state.set_dry(bool(update_data['dry']), expected_token)
|
||||
try:
|
||||
if 'branches' in update_data:
|
||||
if not env:
|
||||
raise RuntimeError(f"Unknown env {update_data.get('id', '')}")
|
||||
env.state.set_branches(update_data.get('branches', []), expected_token=expected_token)
|
||||
if 'dry' in update_data:
|
||||
if not env:
|
||||
raise RuntimeError(f"Unknown env {update_data.get('id', '')}")
|
||||
env.state.set_dry(bool(update_data['dry']), expected_token)
|
||||
except SharedStateConflictError as conflict:
|
||||
# if env:
|
||||
# current_state = env.state.progress()
|
||||
# await self.broadcast_error({
|
||||
# 'code': 'BRANCH_STATE_CONFLICT',
|
||||
# 'envId': id,
|
||||
# 'message': str(conflict),
|
||||
# 'current_state': {
|
||||
# 'branches': current_state.branches,
|
||||
# 'token': current_state.token,
|
||||
# },
|
||||
# })
|
||||
continue
|
||||
|
||||
if env:
|
||||
p = get_step(env.pipeline, type(env.state))
|
||||
|
||||
+2
-1
@@ -16,7 +16,8 @@ services:
|
||||
- PYTHONUNBUFFERED=1
|
||||
- VIRTUAL_HOST=brencher.rudolf.keenetic.link
|
||||
- LETSENCRYPT_HOST=brencher.rudolf.keenetic.link
|
||||
- PROFILES=brencher2,torrserv_proxy,immich,registry,gmail_mcp
|
||||
- VERSION=${version}
|
||||
- PROFILES=brencher2,torrserv_proxy,immich,gmail_mcp,hermes,hermes_infra,gitea
|
||||
- SECONDARY_BRENCHER=http://host.docker.internal:5002
|
||||
deploy:
|
||||
replicas: 1
|
||||
|
||||
+24
-3
@@ -13,6 +13,7 @@ const closeStatus = document.getElementById('close-status');
|
||||
const refreshBranchesBtn = document.getElementById('refresh-branches');
|
||||
const applyChangesBtn = document.getElementById('apply-changes');
|
||||
const branchFilter = document.getElementById('branch-filter');
|
||||
const appVersion = document.getElementById('app-version');
|
||||
|
||||
// Branches list (flattened) for UI rendering: [{ envId, envName, branch, commits: [] }]
|
||||
let branches = [];
|
||||
@@ -137,9 +138,20 @@ function escapeHtml(str) {
|
||||
}
|
||||
|
||||
let renderedBranches = []
|
||||
let renderedDryRunState = {}
|
||||
let renderedColumnsSignature = ''
|
||||
|
||||
function getColumnsSignature() {
|
||||
return JSON.stringify(columnsByEnv);
|
||||
}
|
||||
|
||||
function renderBranches() {
|
||||
if (JSON.stringify(filteredBranches) === JSON.stringify(renderedBranches) && JSON.stringify(dryRunByEnv) === JSON.stringify(renderedDryRunState)) {
|
||||
const columnsSignature = getColumnsSignature();
|
||||
if (
|
||||
JSON.stringify(filteredBranches) === JSON.stringify(renderedBranches) &&
|
||||
JSON.stringify(dryRunByEnv) === JSON.stringify(renderedDryRunState) &&
|
||||
columnsSignature === renderedColumnsSignature
|
||||
) {
|
||||
return
|
||||
}
|
||||
checkForPendingChanges();
|
||||
@@ -252,8 +264,9 @@ function renderBranches() {
|
||||
filterBranches();
|
||||
};
|
||||
});
|
||||
renderedBranches = filteredBranches;
|
||||
renderedBranches = [...filteredBranches];
|
||||
renderedDryRunState = {...dryRunByEnv};
|
||||
renderedColumnsSignature = columnsSignature;
|
||||
}
|
||||
|
||||
function updateBranchCommit(envId, branch, commit) {
|
||||
@@ -465,14 +478,20 @@ function setupWebSockets() {
|
||||
filterBranches();
|
||||
renderJobs();
|
||||
showStatus('Environments updated.');
|
||||
} else if ('version' in message) {
|
||||
appVersion.textContent = `Version: ${message.version || 'unknown'}`;
|
||||
} else if ('error' in message) {
|
||||
console.error('Error from server:', message.error);
|
||||
if (message.error && message.error.code === 'BRANCH_STATE_CONFLICT' && message.error.envId) {
|
||||
const envId = message.error.envId;
|
||||
const current = message.error.current_state || {};
|
||||
const hadLocalSelection = Object.prototype.hasOwnProperty.call(selectedBranchesByEnv, envId);
|
||||
if (Array.isArray(current.branches)) {
|
||||
selectedBranchesByEnv[envId] = [...current.branches];
|
||||
serverSelectedBranchesByEnv[envId] = [...current.branches];
|
||||
// Preserve the user's pending edits if they already changed selection locally.
|
||||
if (!hadLocalSelection) {
|
||||
selectedBranchesByEnv[envId] = [...current.branches];
|
||||
}
|
||||
}
|
||||
if (typeof current.token === 'string') {
|
||||
serverTokenByEnv[envId] = current.token;
|
||||
@@ -503,6 +522,8 @@ function updateEnvironment() {
|
||||
if (JSON.stringify(localSel) !== JSON.stringify(serverSel)) {
|
||||
if (ws && ws.readyState === WebSocket.OPEN) {
|
||||
ws.send(JSON.stringify({ update: { id: envId, branches: selectedBranchesByEnv[envId], token: serverTokenByEnv[envId] } }));
|
||||
// Keep pending-state tracking aligned with what we just submitted.
|
||||
serverSelectedBranchesByEnv[envId] = [...(selectedBranchesByEnv[envId] || [])];
|
||||
}
|
||||
branchFilter.value = '';
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<div class="container">
|
||||
<header>
|
||||
<h1>Brencher - Branch Merger</h1>
|
||||
<p class="version" id="app-version">Version: loading...</p>
|
||||
<div id="status-bar" class="status-bar hidden">
|
||||
<span id="status-message"></span>
|
||||
<button id="close-status">×</button>
|
||||
|
||||
@@ -15,6 +15,13 @@ body {
|
||||
padding: 32px;
|
||||
}
|
||||
|
||||
.version {
|
||||
color: #6c757d;
|
||||
font-family: monospace;
|
||||
font-size: 0.85rem;
|
||||
margin-top: -12px;
|
||||
}
|
||||
|
||||
.primary-button {
|
||||
background: #007bff;
|
||||
color: #fff;
|
||||
|
||||
@@ -20,6 +20,25 @@ class BrencherPage:
|
||||
button.wait_for(state="visible", timeout=10000)
|
||||
return button
|
||||
|
||||
def _apply_changes_button(self) -> Locator:
|
||||
button = self._page.locator("#apply-changes")
|
||||
button.wait_for(state="visible", timeout=10000)
|
||||
return button
|
||||
|
||||
def _branch_checkbox(self, branch_name: str) -> Locator:
|
||||
checkbox = self._page.locator(
|
||||
f'input[type="checkbox"][data-env="{self._env_id}"][value="{branch_name}"]'
|
||||
)
|
||||
checkbox.wait_for(state="visible", timeout=10000)
|
||||
return checkbox
|
||||
|
||||
def _desired_commit_select(self, branch_name: str) -> Locator:
|
||||
select = self._page.locator(
|
||||
f'select.desired-commit[data-env="{self._env_id}"][data-branch="{branch_name}"]'
|
||||
)
|
||||
select.wait_for(state="visible", timeout=10000)
|
||||
return select
|
||||
|
||||
def verify_dry_run_on(self) -> None:
|
||||
btn_title = self._dry_run_button().get_attribute("title") or ""
|
||||
assert "Dry run on" in btn_title, f"Expected dry run to be active, got title: {btn_title!r}"
|
||||
@@ -29,6 +48,39 @@ class BrencherPage:
|
||||
self._dry_run_button().click()
|
||||
self._logger.info("Clicked dry-run button to disable dry run")
|
||||
|
||||
def set_branch_unselected(self, branch_name: str) -> None:
|
||||
checkbox = self._branch_checkbox(branch_name)
|
||||
if checkbox.is_checked():
|
||||
checkbox.uncheck()
|
||||
self._logger.info("Unchecked branch '%s'", branch_name)
|
||||
|
||||
def set_branch_desired_commit(self, branch_name: str, commit_hash: str) -> None:
|
||||
self._desired_commit_select(branch_name).select_option(value=commit_hash)
|
||||
self._logger.info("Set desired commit for branch '%s' to '%s'", branch_name, commit_hash)
|
||||
|
||||
def set_apply_changes(self) -> None:
|
||||
self._apply_changes_button().click()
|
||||
self._logger.info("Clicked Apply Changes")
|
||||
|
||||
def set_simulate_branch_state_conflict(self) -> None:
|
||||
self._page.evaluate(
|
||||
"""({ envId }) => {
|
||||
const currentToken =
|
||||
(typeof serverTokenByEnv !== 'undefined' && serverTokenByEnv[envId])
|
||||
? serverTokenByEnv[envId]
|
||||
: 'server-token';
|
||||
const staleToken = `${currentToken}-stale`;
|
||||
if (typeof serverTokenByEnv !== 'undefined') {
|
||||
// Simulate stale client-side token so next apply uses an outdated value.
|
||||
serverTokenByEnv[envId] = staleToken;
|
||||
}
|
||||
}""",
|
||||
{
|
||||
"envId": self._env_id,
|
||||
},
|
||||
)
|
||||
self._logger.info("Set stale branch token for '%s'", self._env_id)
|
||||
|
||||
def click_refresh(self) -> None:
|
||||
self._page.locator("#refresh-branches").click()
|
||||
self._logger.info("Clicked refresh button")
|
||||
@@ -46,6 +98,55 @@ class BrencherPage:
|
||||
timeout=10000,
|
||||
)
|
||||
|
||||
def verify_apply_changes_visible(self) -> None:
|
||||
self._page.wait_for_function(
|
||||
"""() => {
|
||||
const btn = document.querySelector('#apply-changes');
|
||||
return !!btn && !btn.classList.contains('hidden');
|
||||
}""",
|
||||
timeout=10000,
|
||||
)
|
||||
self._logger.info("Apply Changes button is visible")
|
||||
|
||||
def verify_apply_changes_hidden(self) -> None:
|
||||
self._page.wait_for_function(
|
||||
"""() => {
|
||||
const btn = document.querySelector('#apply-changes');
|
||||
return !!btn && btn.classList.contains('hidden');
|
||||
}""",
|
||||
timeout=10000,
|
||||
)
|
||||
self._logger.info("Apply Changes button is hidden")
|
||||
|
||||
def verify_branch_column_value(self, branch_name: str, column_name: str, expected_value: str, timeout_ms: int = 10000) -> None:
|
||||
self._page.wait_for_function(
|
||||
"""({ envId, branchName, columnName, expectedValue }) => {
|
||||
const row = document.querySelector(`tr.branch-row[data-env="${envId}"][data-branch="${branchName}"]`);
|
||||
if (!row) return false;
|
||||
const table = row.closest('table.branches-table');
|
||||
if (!table) return false;
|
||||
const headers = [...table.querySelectorAll('thead th')].map(th => (th.textContent || '').trim());
|
||||
const colIdx = headers.indexOf(columnName);
|
||||
if (colIdx === -1) return false;
|
||||
const cells = [...row.querySelectorAll('td')];
|
||||
if (cells.length <= colIdx) return false;
|
||||
return ((cells[colIdx].textContent || '').trim() === expectedValue);
|
||||
}""",
|
||||
arg={
|
||||
"envId": self._env_id,
|
||||
"branchName": branch_name,
|
||||
"columnName": column_name,
|
||||
"expectedValue": expected_value,
|
||||
},
|
||||
timeout=timeout_ms,
|
||||
)
|
||||
self._logger.info(
|
||||
"Verified column '%s' for branch '%s' equals '%s'",
|
||||
column_name,
|
||||
branch_name,
|
||||
expected_value,
|
||||
)
|
||||
|
||||
def verify_pipeline_step_status(self, step_name: str, expected_status: str, timeout_ms: int = 10000) -> None:
|
||||
"""
|
||||
Verify that a pipeline step reaches the expected status by polling the page DOM.
|
||||
|
||||
@@ -0,0 +1,127 @@
|
||||
import logging
|
||||
import threading
|
||||
import time
|
||||
from typing import Any, Generator
|
||||
|
||||
import docker
|
||||
import pytest
|
||||
import requests
|
||||
import socket
|
||||
|
||||
from app import App
|
||||
from tests.configs import nginx
|
||||
from tests.conftest import EventuallyFn, assert_equal
|
||||
from tests.playwright_helper import brencher_page
|
||||
|
||||
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
APP_PORT = 5003
|
||||
APP_URL = f"http://localhost:{APP_PORT}"
|
||||
CONTAINER_NAME = "test_plain-container"
|
||||
|
||||
# Module-level reference to server thread to ensure proper cleanup
|
||||
_server_thread: threading.Thread | None = None
|
||||
|
||||
|
||||
def _is_port_free(port: int, timeout: float = 5.0) -> bool:
|
||||
"""Check if a port is available for binding."""
|
||||
deadline = time.time() + timeout
|
||||
while time.time() < deadline:
|
||||
try:
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
result = sock.connect_ex(('127.0.0.1', port))
|
||||
sock.close()
|
||||
if result != 0:
|
||||
return True
|
||||
except Exception:
|
||||
return True
|
||||
time.sleep(0.1)
|
||||
return False
|
||||
|
||||
|
||||
class TestApplyChangesPlaywright:
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_teardown(self) -> Generator[None, Any, None]:
|
||||
global _server_thread
|
||||
|
||||
def stop_and_remove_container() -> None:
|
||||
client = docker.from_env()
|
||||
try:
|
||||
container = client.containers.get(CONTAINER_NAME)
|
||||
container.stop(timeout=10)
|
||||
container.remove(force=True)
|
||||
logger.info("Container %s stopped and removed", CONTAINER_NAME)
|
||||
except Exception:
|
||||
logger.info("Container %s not found, no need to stop/remove", CONTAINER_NAME)
|
||||
|
||||
# Ensure port is free before starting
|
||||
_is_port_free(APP_PORT, timeout=5.0)
|
||||
|
||||
stop_and_remove_container()
|
||||
yield None
|
||||
|
||||
# Clean up server thread
|
||||
if _server_thread and _server_thread.is_alive():
|
||||
_server_thread.join(timeout=2.0)
|
||||
logger.info("Waited for server thread to finish")
|
||||
|
||||
# Ensure port is free after test
|
||||
_is_port_free(APP_PORT, timeout=5.0)
|
||||
|
||||
stop_and_remove_container()
|
||||
_server_thread = None
|
||||
|
||||
def test_apply_button_hides_after_apply_branch_change(self, eventually: EventuallyFn) -> None:
|
||||
global _server_thread
|
||||
|
||||
# Start app with one pre-selected branch so unchecking creates pending changes.
|
||||
env = nginx.test_local1
|
||||
env.state.set_branches([("test/main", "HEAD")])
|
||||
env.state.set_dry(True)
|
||||
app = App({env.id: env})
|
||||
_server_thread = threading.Thread(target=lambda: app.runWeb(APP_PORT), daemon=True)
|
||||
_server_thread.start()
|
||||
|
||||
eventually(
|
||||
lambda: assert_equal(
|
||||
requests.get(f"{APP_URL}/state", timeout=5).status_code,
|
||||
200,
|
||||
"Server did not respond with 200 OK within timeout",
|
||||
)
|
||||
)
|
||||
|
||||
with brencher_page(APP_URL, env.id) as page:
|
||||
page.set_branch_unselected("test/main")
|
||||
page.verify_apply_changes_visible()
|
||||
page.set_apply_changes()
|
||||
eventually(lambda: page.verify_apply_changes_hidden(), timeout=10, interval=0.5)
|
||||
|
||||
def test_apply_button_reappears_on_branch_conflict(self, eventually: EventuallyFn) -> None:
|
||||
global _server_thread
|
||||
|
||||
env = nginx.test_local1
|
||||
env.state.set_branches([("test/main", "HEAD")])
|
||||
env.state.set_dry(True)
|
||||
app = App({env.id: env})
|
||||
_server_thread = threading.Thread(target=lambda: app.runWeb(APP_PORT), daemon=True)
|
||||
_server_thread.start()
|
||||
|
||||
eventually(
|
||||
lambda: assert_equal(
|
||||
requests.get(f"{APP_URL}/state", timeout=5).status_code,
|
||||
200,
|
||||
"Server did not respond with 200 OK within timeout",
|
||||
)
|
||||
)
|
||||
|
||||
with brencher_page(APP_URL, env.id) as page:
|
||||
page.set_branch_unselected("test/main")
|
||||
page.verify_apply_changes_visible()
|
||||
# Set stale token in client JS object so backend returns a real conflict on apply.
|
||||
page.set_simulate_branch_state_conflict()
|
||||
page.set_apply_changes()
|
||||
eventually(lambda: page.verify_apply_changes_visible(), timeout=10, interval=0.5)
|
||||
@@ -0,0 +1,182 @@
|
||||
import logging
|
||||
import socket
|
||||
import threading
|
||||
import time
|
||||
from typing import Any, Generator
|
||||
|
||||
import docker
|
||||
import pytest
|
||||
import requests
|
||||
|
||||
from app import App
|
||||
from tests.configs import nginx
|
||||
from tests.conftest import EventuallyFn, assert_equal
|
||||
from tests.playwright_helper import brencher_page
|
||||
|
||||
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
APP_PORT = 5004
|
||||
APP_URL = f"http://localhost:{APP_PORT}"
|
||||
CONTAINER_NAME = "test_plain-container"
|
||||
TARGET_BRANCH = "test/main"
|
||||
|
||||
_server_thread: threading.Thread | None = None
|
||||
|
||||
|
||||
def _is_port_free(port: int, timeout: float = 5.0) -> bool:
|
||||
"""Check if a port is available for binding."""
|
||||
deadline = time.time() + timeout
|
||||
while time.time() < deadline:
|
||||
try:
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
result = sock.connect_ex(("127.0.0.1", port))
|
||||
sock.close()
|
||||
if result != 0:
|
||||
return True
|
||||
except Exception:
|
||||
return True
|
||||
time.sleep(0.1)
|
||||
return False
|
||||
|
||||
|
||||
def _get_state() -> dict[str, Any]:
|
||||
response = requests.get(f"{APP_URL}/state", timeout=5)
|
||||
assert response.status_code == 200, f"Expected status 200 from /state, got {response.status_code}"
|
||||
data = response.json()
|
||||
assert isinstance(data, dict), f"Expected dict from /state, got {type(data)}"
|
||||
return data
|
||||
|
||||
|
||||
def _get_deployed_short_hash(env_id: str, branch: str) -> str:
|
||||
state = _get_state()
|
||||
env_state = state.get(env_id)
|
||||
assert isinstance(env_state, dict), f"No environment state for {env_id}: {state}"
|
||||
|
||||
pipeline = env_state.get("pipeline")
|
||||
assert isinstance(pipeline, list), f"Pipeline is not list for {env_id}: {env_state}"
|
||||
|
||||
step = next((p for p in pipeline if p.get("name") == "GitUnmerge"), None)
|
||||
assert isinstance(step, dict), f"GitUnmerge step not found in pipeline: {pipeline}"
|
||||
assert not bool(step.get("is_running")), f"GitUnmerge is still running: {step}"
|
||||
|
||||
status = step.get("status")
|
||||
assert isinstance(status, dict), f"GitUnmerge status is not an object: {status}"
|
||||
|
||||
columns = status.get("columns")
|
||||
assert isinstance(columns, dict), f"GitUnmerge columns missing: {status}"
|
||||
|
||||
deployed = columns.get("Deployed")
|
||||
assert isinstance(deployed, dict), f"Deployed column missing: {columns}"
|
||||
|
||||
value = deployed.get(branch)
|
||||
assert isinstance(value, str) and len(value) == 8, f"Deployed value for {branch} invalid: {value}"
|
||||
return value
|
||||
|
||||
|
||||
def _pick_target_commit(env_id: str, branch: str) -> str:
|
||||
response = requests.get(f"{APP_URL}/branches", timeout=5)
|
||||
assert response.status_code == 200, f"Expected status 200 from /branches, got {response.status_code}"
|
||||
data = response.json()
|
||||
assert isinstance(data, dict), f"Expected dict from /branches, got {type(data)}"
|
||||
|
||||
env_branches = data.get(env_id, {})
|
||||
assert isinstance(env_branches, dict), f"Expected env branch map for {env_id}, got {env_branches}"
|
||||
|
||||
commits = env_branches.get(branch, [])
|
||||
assert isinstance(commits, list), f"Expected commits list for {branch}, got {commits}"
|
||||
|
||||
for commit in commits:
|
||||
if not isinstance(commit, dict):
|
||||
continue
|
||||
hexsha = commit.get("hexsha")
|
||||
if isinstance(hexsha, str) and len(hexsha) >= 8:
|
||||
return hexsha
|
||||
|
||||
raise AssertionError(f"Unable to find any commit for branch {branch}.")
|
||||
|
||||
|
||||
def _assert_deployed_hash_available(env_id: str, branch: str) -> None:
|
||||
value = _get_deployed_short_hash(env_id, branch)
|
||||
assert isinstance(value, str) and len(value) == 8
|
||||
|
||||
|
||||
class TestDeployColumnPlaywright:
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_teardown(self) -> Generator[None, Any, None]:
|
||||
global _server_thread
|
||||
|
||||
def stop_and_remove_container() -> None:
|
||||
client = docker.from_env()
|
||||
try:
|
||||
container = client.containers.get(CONTAINER_NAME)
|
||||
container.stop(timeout=10)
|
||||
container.remove(force=True)
|
||||
logger.info("Container %s stopped and removed", CONTAINER_NAME)
|
||||
except Exception:
|
||||
logger.info("Container %s not found, no need to stop/remove", CONTAINER_NAME)
|
||||
|
||||
_is_port_free(APP_PORT, timeout=5.0)
|
||||
|
||||
stop_and_remove_container()
|
||||
yield None
|
||||
|
||||
if _server_thread and _server_thread.is_alive():
|
||||
_server_thread.join(timeout=2.0)
|
||||
logger.info("Waited for server thread to finish")
|
||||
|
||||
_is_port_free(APP_PORT, timeout=5.0)
|
||||
stop_and_remove_container()
|
||||
_server_thread = None
|
||||
|
||||
def test_deployed_column_updates_after_apply_changes_and_deploy(self, eventually: EventuallyFn) -> None:
|
||||
global _server_thread
|
||||
|
||||
env = nginx.test_local1
|
||||
env.state.set_branches([(TARGET_BRANCH, "HEAD")])
|
||||
env.state.set_dry(True)
|
||||
|
||||
app = App({env.id: env})
|
||||
_server_thread = threading.Thread(target=lambda: app.runWeb(APP_PORT), daemon=True)
|
||||
_server_thread.start()
|
||||
|
||||
eventually(
|
||||
lambda: assert_equal(
|
||||
requests.get(f"{APP_URL}/state", timeout=5).status_code,
|
||||
200,
|
||||
"Server did not respond with 200 OK within timeout",
|
||||
),
|
||||
timeout=20,
|
||||
interval=0.5,
|
||||
)
|
||||
|
||||
target_commit = _pick_target_commit(env.id, TARGET_BRANCH)
|
||||
|
||||
with brencher_page(APP_URL, env.id) as page:
|
||||
page.verify_dry_run_on()
|
||||
page.set_branch_desired_commit(TARGET_BRANCH, target_commit)
|
||||
page.verify_apply_changes_visible()
|
||||
page.set_apply_changes()
|
||||
|
||||
eventually(lambda: page.verify_apply_changes_hidden(), timeout=20, interval=0.5)
|
||||
|
||||
page.set_dry_run_off()
|
||||
eventually(lambda: page.verify_dry_run_off(), timeout=20, interval=0.5)
|
||||
page.click_refresh()
|
||||
|
||||
eventually(
|
||||
lambda: _assert_deployed_hash_available(env.id, TARGET_BRANCH),
|
||||
timeout=90,
|
||||
interval=1.0,
|
||||
)
|
||||
|
||||
deployed_short_hash = _get_deployed_short_hash(env.id, TARGET_BRANCH)
|
||||
|
||||
eventually(
|
||||
lambda: page.verify_branch_column_value(TARGET_BRANCH, "Deployed", deployed_short_hash),
|
||||
timeout=30,
|
||||
interval=0.5,
|
||||
)
|
||||
@@ -1,5 +1,7 @@
|
||||
import logging
|
||||
import threading
|
||||
import time
|
||||
import socket
|
||||
from typing import Any, Callable, Generator, TypeVar
|
||||
|
||||
import docker
|
||||
@@ -17,10 +19,32 @@ APP_PORT = 5003
|
||||
APP_URL = f"http://localhost:{APP_PORT}"
|
||||
CONTAINER_NAME = "test_plain-container"
|
||||
|
||||
# Module-level reference to server thread to ensure proper cleanup
|
||||
_server_thread: threading.Thread | None = None
|
||||
|
||||
|
||||
def _is_port_free(port: int, timeout: float = 5.0) -> bool:
|
||||
"""Check if a port is available for binding."""
|
||||
deadline = time.time() + timeout
|
||||
while time.time() < deadline:
|
||||
try:
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
result = sock.connect_ex(('127.0.0.1', port))
|
||||
sock.close()
|
||||
if result != 0:
|
||||
return True
|
||||
except Exception:
|
||||
return True
|
||||
time.sleep(0.1)
|
||||
return False
|
||||
|
||||
class TestDryRunPlaywright:
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_teardown(self) -> Generator[None, Any, None]:
|
||||
global _server_thread
|
||||
|
||||
def stop_and_remove_container() -> None:
|
||||
client = docker.from_env()
|
||||
try:
|
||||
@@ -30,19 +54,35 @@ class TestDryRunPlaywright:
|
||||
logger.info(f"Container {CONTAINER_NAME} stopped and removed")
|
||||
except Exception:
|
||||
logger.info(f"Container {CONTAINER_NAME} not found, no need to stop/remove")
|
||||
|
||||
# Ensure port is free before starting
|
||||
_is_port_free(APP_PORT, timeout=5.0)
|
||||
|
||||
stop_and_remove_container()
|
||||
yield None
|
||||
|
||||
# Clean up server thread
|
||||
if _server_thread and _server_thread.is_alive():
|
||||
_server_thread.join(timeout=2.0)
|
||||
logger.info("Waited for server thread to finish")
|
||||
|
||||
# Ensure port is free after test
|
||||
_is_port_free(APP_PORT, timeout=5.0)
|
||||
|
||||
stop_and_remove_container()
|
||||
_server_thread = None
|
||||
|
||||
|
||||
def test_dry_run_prevents_deploy_until_disabled(self, eventually: EventuallyFn) -> None:
|
||||
global _server_thread
|
||||
|
||||
# Start app with nginx_local1 with main branch pre-selected and dry mode on.
|
||||
env = nginx.test_local1
|
||||
env.state.set_branches([("test/main", "HEAD")])
|
||||
env.state.set_dry(True)
|
||||
app = App({env.id: env})
|
||||
server_thread = threading.Thread(target=lambda: app.runWeb(APP_PORT), daemon=True)
|
||||
server_thread.start()
|
||||
_server_thread = threading.Thread(target=lambda: app.runWeb(APP_PORT), daemon=True)
|
||||
_server_thread.start()
|
||||
|
||||
# Wait for server to be up
|
||||
eventually(lambda: assert_equal(requests.get(f"{APP_URL}/state", timeout=5).status_code, 200, "Server did not respond with 200 OK within timeout"))
|
||||
|
||||
Reference in New Issue
Block a user