diff --git a/stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py b/stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py index 24a529c2..1e343d0a 100644 --- a/stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py +++ b/stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py @@ -172,6 +172,7 @@ def process_app_deployment_request( logger.log( f"Creating webapp deployment in: {deployment_dir} with container id: {deployment_container_tag}" ) + # CREATES DEPLOYMENT DIR, NOT SKIPPING FOR TESTING deploy_webapp.create_deployment( ctx, deployment_dir, @@ -214,21 +215,24 @@ def process_app_deployment_request( # add_tags_to_image(image_registry, app_image_shared_tag, deployment_container_tag) logger.log("Tag complete") else: - extra_build_args = [] # TODO: pull from request - logger.log(f"Building container image: {deployment_container_tag}") - build_container_image( - app, deployment_container_tag, extra_build_args, logger - ) - logger.log("Build complete") - logger.log(f"Pushing container image: {deployment_container_tag}") - push_container_image(deployment_dir, logger) - logger.log("Push complete") - # The build/push commands above will use the unique deployment tag, so now we need to add the shared tag. - logger.log( - f"(SKIPPED) Adding global app image tag: {app_image_shared_tag} to newly built image: {deployment_container_tag}" - ) - # add_tags_to_image(image_registry, deployment_container_tag, app_image_shared_tag) - logger.log("Tag complete") + # SKIP BUILD + logger.log("TESTING: Skipping container build.") + + # extra_build_args = [] # TODO: pull from request + # logger.log(f"Building container image: {deployment_container_tag}") + # build_container_image( + # app, deployment_container_tag, extra_build_args, logger + # ) + # logger.log("Build complete") + # logger.log(f"Pushing container image: {deployment_container_tag}") + # push_container_image(deployment_dir, logger) + # logger.log("Push complete") + # # The build/push commands above will use the unique deployment tag, so now we need to add the shared tag. + # logger.log( + # f"(SKIPPED) Adding global app image tag: {app_image_shared_tag} to newly built image: {deployment_container_tag}" + # ) + # # add_tags_to_image(image_registry, deployment_container_tag, app_image_shared_tag) + # logger.log("Tag complete") else: logger.log("Requested app is already deployed, skipping build and image push") @@ -241,7 +245,9 @@ def process_app_deployment_request( # 8. update k8s deployment if needs_k8s_deploy: - deploy_to_k8s(deployment_record, deployment_dir, recreate_on_deploy, logger) + # SKIP DEPLOY + logger.log("TESTING: Skipping deployment to k8s.") + # deploy_to_k8s(deployment_record, deployment_dir, recreate_on_deploy, logger) logger.log("Publishing deployment to registry.") publish_deployment( diff --git a/stack_orchestrator/deploy/webapp/undeploy_webapp_from_registry.py b/stack_orchestrator/deploy/webapp/undeploy_webapp_from_registry.py index 90e62197..3dfc5636 100644 --- a/stack_orchestrator/deploy/webapp/undeploy_webapp_from_registry.py +++ b/stack_orchestrator/deploy/webapp/undeploy_webapp_from_registry.py @@ -72,11 +72,12 @@ def process_app_removal_request( # TODO(telackey): Call the function directly. The easiest way to build the correct click context is to # exec the process, but it would be better to refactor so we could just call down_operation with the # necessary parameters - down_command = [sys.argv[0], "deployment", "--dir", deployment_dir, "down"] - if delete_volumes: - down_command.append("--delete-volumes") - result = subprocess.run(down_command) - result.check_returncode() + main_logger.log("TESTING: Skipping stopping deployment.") + # down_command = [sys.argv[0], "deployment", "--dir", deployment_dir, "down"] + # if delete_volumes: + # down_command.append("--delete-volumes") + # result = subprocess.run(down_command) + # result.check_returncode() removal_record = { "record": {