diff --git a/.gitea/workflows/add-new-service.yml b/.gitea/workflows/add-new-service.yml index 86fce82..3c3af1a 100644 --- a/.gitea/workflows/add-new-service.yml +++ b/.gitea/workflows/add-new-service.yml @@ -14,6 +14,17 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Parse Service Directory Name + id: parse_branch + # Uses bash shell parameter elimination to strip 'feature/add-service-' from the front + run: | + BRANCH="${{ github.ref_name }}" + SERVICE_NAME="${BRANCH#feature/add-service-}" + echo "service_name=$SERVICE_NAME" >> $GITHUB_OUTPUT + - name: Run New Service Playbook run: | - ansible-playbook ansible/playbooks/add-new-service.yml -i ansible/hosts.yml --extra-vars="repo_root=${{ github.workspace }} agebd_env=dev" -v \ No newline at end of file + ansible-playbook ansible/playbooks/add-new-service.yml \ + -i ansible/hosts.yml \ + --extra-vars="repo_root=${{ github.workspace }} agebd_env=dev service_dir_name=${{ steps.parse_branch.outputs.service_name }}" \ + -v \ No newline at end of file diff --git a/ansible/playbooks/add-new-service.yml b/ansible/playbooks/add-new-service.yml index 5dd2bfe..0425280 100644 --- a/ansible/playbooks/add-new-service.yml +++ b/ansible/playbooks/add-new-service.yml @@ -5,4 +5,7 @@ import_playbook: ../plays/ioc/ioc-install-and-restart-master.yml - name: Deploy and Restart Master Service - import_playbook: ../plays/service/service-deploy-and-restart-master.yml \ No newline at end of file + import_playbook: ../plays/service/service-deploy-and-restart-master.yml + +- name: Install and Restart New IOC + import_playbook: ../plays/ioc/ioc-install-and-restart.yml \ No newline at end of file diff --git a/cli/src/core/service_creator.py b/cli/src/core/service_creator.py index cc10e5b..973fdce 100644 --- a/cli/src/core/service_creator.py +++ b/cli/src/core/service_creator.py @@ -53,7 +53,7 @@ class ServiceCreator: hla_names = MasterHLANames.read_from_config() hla_names.add_hla_name(service.name_upper) - branch_name = f"feature/add-service-{service.name_lower}" + branch_name = f"feature/add-service-{service.dir_name}" delete_local_branch(repo, branch_name) switch_branch(repo, branch_name)