From 81eb41acc86920076306dfef78c545206f66c63d Mon Sep 17 00:00:00 2001 From: mirageoasis <37329424+mirageoasis@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:48:12 +0900 Subject: [PATCH] chore(tests): remove unused env-tester files (#1956) Backported-from: main (24.09) Backported-to: 24.03 Co-authored-by: Joongi Kim --- .github/workflows/integration.yml | 2 -- changes/1956.deprecation.md | 1 + scripts/install-dev.sh | 11 ----------- 3 files changed, 1 insertion(+), 13 deletions(-) create mode 100644 changes/1956.deprecation.md diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 0242a70c26..063a3eb825 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -45,9 +45,7 @@ jobs: shell: 'script -q -e -c "bash {0}"' run: | ./scripts/install-dev.sh - source env-tester-admin.sh ./backend.ai test run-cli admin - source env-tester-user.sh ./backend.ai test run-cli user - name: Upload pants log uses: actions/upload-artifact@v4 diff --git a/changes/1956.deprecation.md b/changes/1956.deprecation.md new file mode 100644 index 0000000000..3f1b45b0aa --- /dev/null +++ b/changes/1956.deprecation.md @@ -0,0 +1 @@ +Remove no longer used `env-tester-{admin,user,user2}.sh` scripts and all references diff --git a/scripts/install-dev.sh b/scripts/install-dev.sh index dadf935279..5d9010b07c 100755 --- a/scripts/install-dev.sh +++ b/scripts/install-dev.sh @@ -941,11 +941,6 @@ configure_backendai() { show_note "The currently embedded webui version: $webui_version" fi - # configure tester - echo "export BACKENDAI_TEST_CLIENT_ENV=${PWD}/env-local-admin-api.sh" > ./env-tester-admin.sh - echo "export BACKENDAI_TEST_CLIENT_ENV=${PWD}/env-local-user-api.sh" > ./env-tester-user.sh - echo "export BACKENDAI_TEST_CLIENT_ENV=${PWD}/env-local-user2-api.sh" > ./env-tester-user2.sh - if [ "${CODESPACES}" = "true" ]; then $docker_sudo docker stop $($docker_sudo docker ps -q) $docker_sudo docker compose -f "docker-compose.halfstack.current.yml" down @@ -1085,12 +1080,6 @@ configure_backendai() { echo "echo 'Password: $(cat fixtures/manager/example-keypairs.json | jq -r '.users[] | select(.username=="user") | .password')'" >> "${CLIENT_USER_CONF_FOR_SESSION}" chmod +x "${CLIENT_USER_CONF_FOR_SESSION}" - # TODO: Update tester env script - ## sed_inplace "s@export BACKENDAI_TEST_CLIENT_VENV=/home/user/.pyenv/versions/venv-dev-client@export BACKENDAI_TEST_CLIENT_VENV=${VENV_PATH}@" ./env-tester-admin.sh - ## sed_inplace "s@export BACKENDAI_TEST_CLIENT_ENV=/home/user/bai-dev/client-py/my-backend-session.sh@export BACKENDAI_TEST_CLIENT_ENV=${INSTALL_PATH}/client-py/${CLIENT_ADMIN_CONF_FOR_API}@" ./env-tester-admin.sh - ## sed_inplace "s@export BACKENDAI_TEST_CLIENT_VENV=/home/user/.pyenv/versions/venv-dev-client@export BACKENDAI_TEST_CLIENT_VENV=${VENV_PATH}@" ./env-tester-user.sh - ## sed_inplace "s@export BACKENDAI_TEST_CLIENT_ENV=/home/user/bai-dev/client-py/my-backend-session.sh@export BACKENDAI_TEST_CLIENT_ENV=${INSTALL_PATH}/client-py/${CLIENT_USER_CONF_FOR_API}@" ./env-tester-user.sh - show_info "Dumping the installed etcd configuration to ./dev.etcd.installed.json as a backup." ./backend.ai mgr etcd get --prefix '' > ./dev.etcd.installed.json