Cleanup housekeeping nov2023 (#428)

* Remove referencs to deployment agent

* Remove unused variabled from prior, now-removed dependency logspout

* fix weird spelling of simcore

---------

Co-authored-by: kaiser <[email protected]>

.gitignore

@@ -102,8 +102,6 @@ docs/_build
 
 # Mypy Cache
 .mypy_cache/
-# deployment config
-deployment_config.yaml
 
 # all fake files from makefile
 .make*

.pre-commit-config.yaml

@@ -116,4 +116,4 @@ repos:
         entry: 'scripts/pre-commit-hooks/stack-yml-generated-is-valid/launch.bash'
         always_run: true
         language: script
-        files: '^((.*)\/services\/simcore\/(.*))|((.*)\/services\/deployment-agent\/(.*))$'
+        files: '^((.*)\/services\/simcore\/(.*))$'

scripts/deployments/prepare_simcore_stack.bash

@@ -42,7 +42,7 @@ cp "$repo_config" "$repo_basedir"
 cd "$repo_basedir"
 
 log_info "Creating stack.yml file..."
-services/deployment-agent/startup_script.bash
+scripts/deployments/startup_script.bash
 
 log_info "Adding prefix $PREFIX_STACK_NAME to all services..."
 ./yq "with(.services; with_entries(.key |= \"${PREFIX_STACK_NAME}_\" + .))" stack.yml > "$this_script_dir"/stack_with_prefix.yml

scripts/deployments/start_without_deployment_agent.bash

@@ -129,7 +129,7 @@ cd "$repo_basedir"
 rm -fr "$repo_basedir"/.temp
 #
 log_info "Creating stack.yml file..."
-services/deployment-agent/startup_script.bash
+scripts/deployments/startup_script.bash
 log_info "Adding prefix $PREFIX_STACK_NAME to all services..."
 ./yq "with(.services; with_entries(.key |= \"${PREFIX_STACK_NAME}_\" + .))" stack.yml > stack_with_prefix.yml
 log_info "Deleting the $SIMCORE_STACK_NAME docker stack if present"

services/deployment-agent/startup_script.bash → scripts/deployments/startup_script.bash

@@ -49,9 +49,6 @@ source "$repo_basedir"/scripts/logger.bash
 #####################
 #####################
 #
-# It is very important (due to the deployment agent running git clean) no files are overwritten with files of the same name
-#
-#
 # This script assumes that the repo.config file is present at the top level of the ops-repo
 # This script assumes that the docker-compose.yml from the osparc-simcore repo is present at the repo_basedir.
 # This script assumes that the .env.devel from the osparc-simcore repo is present at the repo_basedir

scripts/pre-commit-hooks/stack-yml-generated-is-valid/launch.bash

@@ -67,7 +67,7 @@ cp services/docker-compose.yml "$repo_basedir"
 cp .env-devel "$repo_basedir"
 popd
 rm -rf osparc-simcore 2>/dev/null || true
-"$repo_basedir"/services/deployment-agent/startup_script.bash
+"$repo_basedir"/scripts/deployments/startup_script.bash
 # shellcheck disable=SC2143
 if [[ -z $(grep '[^[:space:]]' "$repo_basedir"/stack.yml) ]] ; then
   error_exit "stack.yml is empty"