(ci) Correct deploy script

This commit is contained in:
Viktor Lofgren 2024-12-22 20:05:39 +01:00
parent 9459b9933b
commit 5ee4321110

View File

@ -156,6 +156,9 @@ def build_and_deploy(plan: DeploymentPlan, service_config: Dict[str, ServiceConf
to_deploy.append(container) to_deploy.append(container)
else: else:
for instance in range(1,config.instances + 1): for instance in range(1,config.instances + 1):
if config.docker_name in plan.instances_to_hold:
continue
container_name = f"{config.docker_name}-{instance}" container_name = f"{config.docker_name}-{instance}"
if container_name in plan.instances_to_hold: if container_name in plan.instances_to_hold:
continue continue
@ -216,13 +219,13 @@ if __name__ == '__main__':
'explorer': ServiceConfig( 'explorer': ServiceConfig(
gradle_target=':code:services-application:explorer-service:docker', gradle_target=':code:services-application:explorer-service:docker',
docker_name='explorer-service', docker_name='explorer-service',
instances=1, instances=None,
deploy_tier=1 deploy_tier=1
), ),
'dating': ServiceConfig( 'dating': ServiceConfig(
gradle_target=':code:services-application:dating-service:docker', gradle_target=':code:services-application:dating-service:docker',
docker_name='dating-service', docker_name='dating-service',
instances=1, instances=None,
deploy_tier=1 deploy_tier=1
), ),
'index': ServiceConfig( 'index': ServiceConfig(
@ -253,10 +256,8 @@ if __name__ == '__main__':
try: try:
tags = get_deployment_tag() tags = get_deployment_tag()
if tags == None: if tags != None:
exit print("Found deployment tags:", tags)
print(tags)
plan = parse_deployment_tags(tags, SERVICE_CONFIG) plan = parse_deployment_tags(tags, SERVICE_CONFIG)
print("\nDeployment Plan:") print("\nDeployment Plan:")
@ -266,6 +267,8 @@ if __name__ == '__main__':
print("\nExecution Plan:") print("\nExecution Plan:")
build_and_deploy(plan, SERVICE_CONFIG) build_and_deploy(plan, SERVICE_CONFIG)
else:
print("No tags found")
except ValueError as e: except ValueError as e:
print(f"Error: {e}") print(f"Error: {e}")