forked from admin/brencher
resolve branches on startup
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
from steps.git import GitClone
|
||||
from steps.git import CheckoutMerged
|
||||
from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
from steps.docker import DockerComposeBuild, DockerSwarmCheck, DockerSwarmDeploy
|
||||
from enironment import Environment
|
||||
from typing import List, Dict, Any, Optional, Tuple
|
||||
@@ -7,7 +6,7 @@ from steps.step import AbstractStep
|
||||
|
||||
env = Environment(
|
||||
id="brencher",
|
||||
branches=["main", "main_pre"],
|
||||
branches=[],
|
||||
dry=False,
|
||||
repo="https://github.com/rudolf1/brencher.git",
|
||||
)
|
||||
@@ -34,11 +33,11 @@ def create_pipeline(env: Environment) -> List[AbstractStep]:
|
||||
env=env
|
||||
)
|
||||
|
||||
|
||||
dockerSwarmCheck = DockerSwarmCheck(
|
||||
stack_name = "brencher",
|
||||
env=env,
|
||||
)
|
||||
|
||||
deployDocker = DockerSwarmDeploy(
|
||||
wd=clone,
|
||||
buildDocker=buildDocker,
|
||||
@@ -50,11 +49,14 @@ def create_pipeline(env: Environment) -> List[AbstractStep]:
|
||||
docker_compose_path = "docker-compose.yml",
|
||||
env=env,
|
||||
)
|
||||
unmerge = GitUnmerge(clone, dockerSwarmCheck, env=env)
|
||||
|
||||
return [
|
||||
clone,
|
||||
checkoutMerged,
|
||||
buildDocker,
|
||||
dockerSwarmCheck,
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
]
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
from steps.git import GitClone
|
||||
from steps.git import CheckoutMerged
|
||||
from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
from steps.docker import DockerComposeBuild
|
||||
from steps.docker import DockerSwarmDeploy, DockerSwarmCheck
|
||||
from enironment import Environment
|
||||
@@ -8,7 +7,7 @@ from steps.step import AbstractStep
|
||||
|
||||
env_local = Environment(
|
||||
id="brencher_local",
|
||||
branches=["main", "main_local"],
|
||||
branches=[],
|
||||
dry=False,
|
||||
repo="https://github.com/rudolf1/brencher.git",
|
||||
)
|
||||
@@ -58,12 +57,14 @@ def create_pipeline(env: Environment) -> List[AbstractStep]:
|
||||
docker_compose_path = "docker-compose.yml",
|
||||
env=env,
|
||||
)
|
||||
unmerge = GitUnmerge(clone, dockerSwarmCheck, env=env)
|
||||
return [
|
||||
clone,
|
||||
checkoutMerged,
|
||||
buildDocker,
|
||||
dockerSwarmCheck,
|
||||
deployDocker,
|
||||
unmerge
|
||||
]
|
||||
|
||||
brencher_local: Tuple[Environment, List[AbstractStep]] = (env_local, create_pipeline(env_local))
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
from enironment import Environment
|
||||
from steps.step import AbstractStep
|
||||
from steps.git import GitUnmerge
|
||||
from typing import List, Dict, Any, Optional, Tuple, Callable
|
||||
import logging
|
||||
|
||||
@@ -14,13 +15,15 @@ def process_all_jobs(
|
||||
try:
|
||||
step._result = None
|
||||
step.result
|
||||
|
||||
if isinstance(step, GitUnmerge) and len(env.branches) == 0:
|
||||
env.branches = [ b1 for c,b in step.result for b1 in b ]
|
||||
logger.error(f"Branches on startup resolved {env.id}, job {step.name}: {env.branches}")
|
||||
except BaseException as e:
|
||||
error_msg = f"Error processing release {env.id}, job {step.name}: {str(e)}"
|
||||
logger.error(error_msg)
|
||||
onupdate()
|
||||
finally:
|
||||
onupdate()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -182,3 +182,47 @@ class CheckoutMerged(AbstractStep[CheckoutAndMergeResult]):
|
||||
logger.info(f"Pushing {auto_branch_hash} to {auto_branch_name}")
|
||||
repo.git.push('-f', 'origin', auto_branch_name)
|
||||
return CheckoutAndMergeResult(auto_branch_name,auto_branch_hash, version)
|
||||
|
||||
|
||||
from steps.docker import DockerSwarmCheckResult, DockerSwarmCheck
|
||||
|
||||
class GitUnmerge(AbstractStep[List[str]]):
|
||||
wd: GitClone
|
||||
|
||||
def __init__(self, wd: GitClone,
|
||||
check: DockerSwarmCheck,
|
||||
**kwargs):
|
||||
super().__init__(**kwargs)
|
||||
self.wd = wd
|
||||
self.check = check
|
||||
|
||||
def progress(self) -> List[str]:
|
||||
wd = self.wd.result
|
||||
deployState: Dict[str, DockerSwarmCheckResult] = self.check.result
|
||||
|
||||
version = set([it.version for it in deployState.values()])
|
||||
if len(version) != 1:
|
||||
raise BaseException(f"Expected exactly one version, got: {version}")
|
||||
version = list(version)[0]
|
||||
repo = git.Repo(wd)
|
||||
if 'auto-' in version:
|
||||
version = version[5:]
|
||||
version = version.split('-')
|
||||
commits = []
|
||||
for v in version:
|
||||
commit = repo.commit(v)
|
||||
# branches = [head.name for head in repo.heads if head.commit.hexsha == commit.hexsha]
|
||||
branches = [ref.name for ref in repo.remotes.origin.refs if ref.commit.hexsha == commit.hexsha]
|
||||
branches = [b[len('origin/'):] for b in branches if b.startswith('origin/') and not b.startswith('origin/HEAD')]
|
||||
|
||||
# if len(branches) == 0 or branches[0].startswith('auto/'):
|
||||
# # Find all parent commits of the given commit
|
||||
# parents = [parent for parent in commit.parents]
|
||||
# branches = [head.name for head in repo.heads for commit in parents if head.commit.hexsha == commit.hexsha]
|
||||
commits.append((commit.hexsha, branches))
|
||||
|
||||
version = commits
|
||||
else:
|
||||
version = [version]
|
||||
return version
|
||||
|
||||
|
||||
Reference in New Issue
Block a user