From 4d832d9f2504173c4a6020665500cb9804e9aab9 Mon Sep 17 00:00:00 2001 From: Mark Wiebe Date: Sun, 27 Aug 2023 14:54:05 -0700 Subject: [PATCH] fix: Update worker binary to deadline-worker-agent where necessary --- src/deadline_worker_agent/installer/__init__.py | 2 +- test/unit/install/test_install.py | 2 +- testing_containers/posix_ldap_multiuser/run_agent.sh | 2 +- testing_containers/posix_ldap_multiuser/term_agent.sh | 2 +- testing_containers/posix_local_multiuser/run_agent.sh | 2 +- testing_containers/posix_local_multiuser/term_agent.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/deadline_worker_agent/installer/__init__.py b/src/deadline_worker_agent/installer/__init__.py index 3d195c15..a4e381d0 100644 --- a/src/deadline_worker_agent/installer/__init__.py +++ b/src/deadline_worker_agent/installer/__init__.py @@ -23,7 +23,7 @@ def install() -> None: arg_parser = get_argument_parser() args = arg_parser.parse_args(namespace=ParsedCommandLineArguments) - worker_agent_program = Path(sysconfig.get_path("scripts")) / "deadline_worker_agent" + worker_agent_program = Path(sysconfig.get_path("scripts")) / "deadline-worker-agent" cmd = [ "sudo", diff --git a/test/unit/install/test_install.py b/test/unit/install/test_install.py index 5ef5f9d4..2e2cec9f 100644 --- a/test/unit/install/test_install.py +++ b/test/unit/install/test_install.py @@ -125,7 +125,7 @@ def expected_cmd( "--user", parsed_args.user, "--worker-agent-program", - os.path.join(sysconfig.get_path("scripts"), "deadline_worker_agent"), + os.path.join(sysconfig.get_path("scripts"), "deadline-worker-agent"), ] if parsed_args.group is not None: expected_cmd.extend(("--group", parsed_args.group)) diff --git a/testing_containers/posix_ldap_multiuser/run_agent.sh b/testing_containers/posix_ldap_multiuser/run_agent.sh index 6583a53a..b2696333 100755 --- a/testing_containers/posix_ldap_multiuser/run_agent.sh +++ b/testing_containers/posix_ldap_multiuser/run_agent.sh @@ -12,7 +12,7 @@ python -m venv .venv source .venv/bin/activate pip install /code/dist/deadline_worker_agent-*-py3-none-any.whl -deadline_worker_agent \ +deadline-worker-agent \ --allow-instance-profile \ --posix-job-user jobuser:sharedgroup \ --no-shutdown \ diff --git a/testing_containers/posix_ldap_multiuser/term_agent.sh b/testing_containers/posix_ldap_multiuser/term_agent.sh index 99b9ec00..6ddd03e9 100755 --- a/testing_containers/posix_ldap_multiuser/term_agent.sh +++ b/testing_containers/posix_ldap_multiuser/term_agent.sh @@ -1,4 +1,4 @@ #!/bin/bash # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -pkill --signal term -f deadline_worker_agent +pkill --signal term -f deadline-worker-agent diff --git a/testing_containers/posix_local_multiuser/run_agent.sh b/testing_containers/posix_local_multiuser/run_agent.sh index 6583a53a..b2696333 100755 --- a/testing_containers/posix_local_multiuser/run_agent.sh +++ b/testing_containers/posix_local_multiuser/run_agent.sh @@ -12,7 +12,7 @@ python -m venv .venv source .venv/bin/activate pip install /code/dist/deadline_worker_agent-*-py3-none-any.whl -deadline_worker_agent \ +deadline-worker-agent \ --allow-instance-profile \ --posix-job-user jobuser:sharedgroup \ --no-shutdown \ diff --git a/testing_containers/posix_local_multiuser/term_agent.sh b/testing_containers/posix_local_multiuser/term_agent.sh index 99b9ec00..6ddd03e9 100755 --- a/testing_containers/posix_local_multiuser/term_agent.sh +++ b/testing_containers/posix_local_multiuser/term_agent.sh @@ -1,4 +1,4 @@ #!/bin/bash # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -pkill --signal term -f deadline_worker_agent +pkill --signal term -f deadline-worker-agent