project layout: move and consolidate scripts

Signed-off-by: Alex Aizman <[email protected]>
NVIDIA · Mar 11, 2024 · 5dbe7d9 · 5dbe7d9
1 parent fb8096b
commit 5dbe7d9
Show file tree

Hide file tree

Showing 36 changed files with 75 additions and 65 deletions.
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Run AIStore
         run: |
           export GOPATH="$(go env GOPATH)"
-          deploy/scripts/clean_deploy.sh --target-cnt 1 --proxy-cnt 1 --mountpath-cnt 1
+          scripts/clean_deploy.sh --target-cnt 1 --proxy-cnt 1 --mountpath-cnt 1
 
       - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

diff --git a/.github/workflows/test-short.yml b/.github/workflows/test-short.yml
@@ -33,5 +33,5 @@ jobs:
       - name: Run and test AIStore
         run: |
           export GOPATH="$(go env GOPATH)"
-          deploy/scripts/clean_deploy.sh --target-cnt 3 --proxy-cnt 1 --mountpath-cnt 2
+          scripts/clean_deploy.sh --target-cnt 3 --proxy-cnt 1 --mountpath-cnt 2
           NUM_PROXY=1 NUM_TARGET=3 BUCKET="ais://test" make test-short
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -12,7 +12,8 @@ include:
     file: /templates/static-analysis/Checkmarx-main-csv.gitlab-ci.yml
 
 variables:
-  MODE: debug # run tests with debug asserts
+  MODE: debug # run aistore and tests with debug asserts enabled
+  SCRIPTS_DIR: "./scripts"
   NUM_TARGET:
     value: "5"
     description: "Number of targets deployed."
@@ -101,7 +102,7 @@ variables:
   stage: test-long
   tags:
     - ais
-  timeout: 4h ## NOTE: when changing, make sure to update deploy/scripts/bootstrap.sh and GitLab /settings/ci_cd
+  timeout: 4h ## NOTE: when changing, make sure to update $SCRIPTS_DIR/bootstrap.sh and GitLab /settings/ci_cd
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "web"'
@@ -113,7 +114,7 @@ variables:
   stage: test-long
   tags:
     - ais
-  timeout: 4h ## NOTE: when changing, make sure to update deploy/scripts/bootstrap.sh and GitLab /settings/ci_cd
+  timeout: 4h ## NOTE: when changing, make sure to update $SCRIPTS_DIR/bootstrap.sh and GitLab /settings/ci_cd
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "main"'
       when: manual
@@ -157,7 +158,7 @@ test:short:
   variables:
     BUCKET: "ais://test"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --deployment all
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --deployment all
     - make test-short
     - FLAGS="--duration=10s" make test-aisloader
 
@@ -168,7 +169,7 @@ test:short:python:
     AIS_ENDPOINT: "http://localhost:8080"
     BUCKET: "aws://ais-ci-python"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --deployment all --aws
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --deployment all --aws
     - cd python
     - make python_sdk_tests
     - make python_botocore_tests
@@ -183,7 +184,7 @@ test:short:python-etl:
   tags:
     - ais-k8s
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --deployment all
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --deployment all
     - cd python
     - make python_etl_tests
   except:
@@ -205,15 +206,15 @@ test:short:minimal:
   variables:
     BUCKET: "ais://test"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt 1 --proxy-cnt 1 --mountpath-cnt $FS_CNT --deployment all
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt 1 --proxy-cnt 1 --mountpath-cnt $FS_CNT --deployment all
     - NUM_PROXY=1 NUM_TARGET=1 make test-short
 
 test:short:s3-compat:
   <<: *test_short_def
   tags:
     - ais
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --deployment all
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --deployment all
     - ais config cluster features Provide-S3-API-via-Root
     - ais config cluster checksum.type=md5
     - cd python/tests/s3compat
@@ -234,7 +235,7 @@ test:short:authn:
     BUCKET: "ais://test"
     RE: "TestAuth"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT
     - ais auth login $AIS_AUTHN_SU_NAME -p $AIS_AUTHN_SU_PASS
     - make test-run
     - ais auth logout
@@ -250,7 +251,7 @@ test:short:https:
     BUCKET: "ais://ais-ci"
   script:
     - openssl req -x509 -out $AIS_SERVER_CRT -keyout $AIS_SERVER_KEY -newkey rsa:2048 -nodes -sha256 -subj '/CN=localhost' -extensions EXT -config <( printf "[dn]\nCN=localhost\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:localhost\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth")
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --deployment all --https
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --deployment all --https
     - make test-short
 
 test:short:s3rproxy:
@@ -260,15 +261,15 @@ test:short:s3rproxy:
     TAGS: "s3rproxy"
     RE: "S3"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT
     - make test-short
 
 test:short:aws:
   <<: *test_short_skip_scheduled_def
   variables:
     BUCKET: "aws://ais-cicd"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --aws
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --aws
     - make test-short
 
 test:short:gcp:
@@ -278,15 +279,15 @@ test:short:gcp:
     BUCKET: "gs://ais-ci"
   script:
     - echo "${GOOGLE_APPLICATION_CREDENTIALS_JSON}" > "${GOOGLE_APPLICATION_CREDENTIALS}"
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
     - make test-short
 
 test:short:azure:
   <<: *test_short_skip_scheduled_def
   variables:
     BUCKET: "az://ais-ci"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --azure
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --azure
     - make test-short
 
 test:long:
@@ -295,7 +296,7 @@ test:long:
     NUM_PROXY: 6
     BUCKET: "ais://ais-ci"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT
     - make test-long
 
 test:long:aws:
@@ -304,7 +305,7 @@ test:long:aws:
     NUM_PROXY: 6
     BUCKET: "aws://ais-cicd"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --aws
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --aws
     - make test-long
 
 test:long:gcp:
@@ -315,7 +316,7 @@ test:long:gcp:
     BUCKET: "gs://ais-ci"
   script:
     - echo "${GOOGLE_APPLICATION_CREDENTIALS_JSON}" > "${GOOGLE_APPLICATION_CREDENTIALS}"
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
     - make test-long
 
 test:long:azure:
@@ -324,7 +325,7 @@ test:long:azure:
     NUM_PROXY: 6
     BUCKET: "az://ais-ci"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --azure
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --azure
     - make test-long
 
 # test:long:hdfs:
@@ -335,7 +336,7 @@ test:long:azure:
 #     BUCKET: "hdfs://ais-ci"
 #   script:
 #     - bash deploy/ci/setup_hdfs.sh
-#     - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --hdfs
+#     - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --hdfs
 #     - ais bucket create "${BUCKET}" --props="extra.hdfs.ref_directory=/"
 #     - make test-long
 
@@ -347,7 +348,7 @@ test:long:aisloader:
   variables:
     AIS_ENDPOINT: "http://localhost:8080"
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT
     - sleep 10 # make sure that cluster properly starts
     - FLAGS="--duration=5m" make test-aisloader
     - cd ./python; make PYAISLOADER_TEST_TYPE=long test-pyaisloader
@@ -396,7 +397,7 @@ test:short:k8s:
     - export NUM_TARGET=3
     - export NUM_PROXY=3
     - echo "${GOOGLE_APPLICATION_CREDENTIALS_JSON}" > "${GOOGLE_APPLICATION_CREDENTIALS}"
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
     - make test-short
     - status=$? make kill && exit $status
 
@@ -419,15 +420,15 @@ test:short:assorted:k8s:
     - export NUM_TARGET=3
     - export NUM_PROXY=3
     - echo "${GOOGLE_APPLICATION_CREDENTIALS_JSON}" > "${GOOGLE_APPLICATION_CREDENTIALS}"
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
     - make test-run
     - status=$? make kill && exit $status
   <<: *gather_logs_def
 
 test:long:k8s:
   stage: test-long
   <<: *test_k8s_long_def
-  timeout: 4h ## NOTE: when changing, make sure to update deploy/scripts/bootstrap.sh and GitLab /settings/ci_cd
+  timeout: 4h ## NOTE: when changing, make sure to update $SCRIPTS_DIR/bootstrap.sh and GitLab /settings/ci_cd
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
     - if: '$CI_MERGE_REQUEST_LABELS =~ /.*k8s-ci.*/'
@@ -437,7 +438,7 @@ test:long:k8s:
   script:
     - export NUM_TARGET=5
     - echo "${GOOGLE_APPLICATION_CREDENTIALS_JSON}" > "${GOOGLE_APPLICATION_CREDENTIALS}"
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
     - make test-run
     - status=$? make kill && exit $status
   <<: *k8s_long_exit_def
@@ -453,7 +454,7 @@ test:long:k8s:single-target:
       allow_failure: true
   script:
     - echo "${GOOGLE_APPLICATION_CREDENTIALS_JSON}" > "${GOOGLE_APPLICATION_CREDENTIALS}"
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp
     - status=0
     - make test-run
     - status=$? make kill && exit $status
@@ -469,7 +470,7 @@ test:long:k8s:aisloader:
       when: manual
       allow_failure: true
   script:
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT
     - sleep 10 # Give some time for the cluster to stabilize.
     - BUCKET="ais://test" FLAGS="--duration=2m --etl" make test-aisloader
     - status=$? make kill && exit $status
@@ -493,7 +494,7 @@ test:long:k8s:all:
     - kubectl apply -f kube-prometheus/manifests/setup && kubectl apply -f kube-prometheus/manifests && rm -rf kube-prometheus
   script:
     - echo "${GOOGLE_APPLICATION_CREDENTIALS_JSON}" > "${GOOGLE_APPLICATION_CREDENTIALS}"
-    - deploy/scripts/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp --aws
+    - ${SCRIPTS_DIR}/clean_deploy.sh --target-cnt $NUM_TARGET --proxy-cnt $NUM_PROXY --mountpath-cnt $FS_CNT --gcp --aws
     - |
       echo "----- RUNNING K8S TESTS -----"
       BUCKET="aws://ais-blossom" RE="TestETL|TestConfig|TestMountpath" make test-run

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 #
 SHELL := /bin/bash
 DEPLOY_DIR = ./deploy/dev/local
-SCRIPTS_DIR = ./deploy/scripts
+SCRIPTS_DIR = ./scripts
 BUILD_DIR = ./cmd
 BUILD_SRC = $(BUILD_DIR)/aisnode/main.go
 

diff --git a/README.md b/README.md
@@ -92,7 +92,7 @@ But there's more. In v3.22, we introduce [blob downloader](docs/blob_downloader.
 Generally, AIStore (cluster) requires at least some sort of [deployment](/deploy#contents) procedure. There are standalone binaries, though, that can be [built](Makefile) from source or, alternatively, installed directly from GitHub:
 
 ```console
-$ ./deploy/scripts/install_from_binaries.sh --help
+$ ./scripts/install_from_binaries.sh --help
 ```
 
 The script installs [aisloader](/docs/aisloader.md) and [CLI](/docs/cli.md) from the most recent, or the previous, GitHub [release](https://github.com/NVIDIA/aistore/releases). For CLI, it'll also enable auto-completions (which is strongly recommended).

diff --git a/action.yml b/action.yml
@@ -37,5 +37,5 @@ runs:
         export GOPATH="$(go env GOPATH)"
         git clone https://github.com/NVIDIA/aistore.git
         cd aistore
-        ./deploy/scripts/clean_deploy.sh --target-cnt ${{ inputs.targets }} --proxy-cnt ${{ inputs.proxies }} --mountpath-cnt ${{ inputs.mountpaths }}
+        ./scripts/clean_deploy.sh --target-cnt ${{ inputs.targets }} --proxy-cnt ${{ inputs.proxies }} --mountpath-cnt ${{ inputs.mountpaths }}
         make cli
diff --git a/cmd/README.md b/cmd/README.md
@@ -27,7 +27,7 @@ Standalone binaries, on the other hand, can be [built](Makefile) from source or
 In particular:
 
 ```console
-$ ./deploy/scripts/install_from_binaries.sh --help
+$ ./scripts/install_from_binaries.sh --help
 
 NAME:
   install_from_binaries.sh - install 'ais' (CLI) and 'aisloader' from release binaries

diff --git a/cmd/cli/Makefile b/cmd/cli/Makefile
@@ -1,5 +1,5 @@
 AISTORE_PATH = $(shell git rev-parse --show-toplevel)
-SCRIPTS_DIR = $(AISTORE_PATH)/deploy/scripts
+SCRIPTS_DIR = $(AISTORE_PATH)/scripts
 
 # Do not print enter/leave directory when doing 'make -C DIR <target>'
 MAKEFLAGS += --no-print-directory

diff --git a/cmd/cli/README.md b/cmd/cli/README.md
@@ -15,15 +15,15 @@ $ make cli-autocompletions	# 2. install CLI autocompletions (Bash and/or Zsh)
 
 Alternatively, install directly from GitHub:
 
-* [Install CLI from release binaries](https://github.com/NVIDIA/aistore/blob/main/deploy/scripts/install_from_binaries.sh)
+* [Install CLI from release binaries](https://github.com/NVIDIA/aistore/blob/main/scripts/install_from_binaries.sh)
 
 For example, the following command extracts CLI binary to the specified destination and, secondly, installs Bash autocompletions:
 
 ```console
-$ ./deploy/scripts/install_from_binaries.sh --dstdir /tmp/www --completions
+$ ./scripts/install_from_binaries.sh --dstdir /tmp/www --completions
 ```
 
-For more usage options, run: `./deploy/scripts/install_from_binaries.sh --help`
+For more usage options, run: `./scripts/install_from_binaries.sh --help`
 
 You can also install Bash and/or Zsh autocompletions separately at any (later) time:
 

diff --git a/cmd/cli/cli/app.go b/cmd/cli/cli/app.go
@@ -32,7 +32,7 @@ const (
 	cliDescr = `If <TAB-TAB> completion doesn't work:
    * download ` + cmn.GitHubHome + `/tree/main/cmd/cli/autocomplete
    * run 'cmd/cli/autocomplete/install.sh'
-   To install CLI directly from GitHub: ` + cmn.GitHubHome + `/blob/main/deploy/scripts/install_from_binaries.sh`
+   To install CLI directly from GitHub: ` + cmn.GitHubHome + `/blob/main/scripts/install_from_binaries.sh`
 
 	// custom cli.AppHelpTemplate
 	// "You can render custom help text by setting this variable." (from github.com/urfave/cli)

diff --git a/deploy/README.md b/deploy/README.md
@@ -2,7 +2,7 @@
 
 |Folder | Intended for | When and how to use | Documentation |
 | --- | --- | --- | --- |
-| [deploy/dev/local](/deploy/dev/local) | developers | use it for non-containerized development on your workstation, laptop, VM, etc. | run `make help` to see usage examples and supported options; visit [deploy/scripts](/deploy/scripts) for alternative scripted ways to run cluster locally  |
+| [deploy/dev/local](/deploy/dev/local) | developers | use it for non-containerized development on your workstation, laptop, VM, etc. | run `make help` to see usage examples and supported options; visit [scripts](/scripts) for alternative scripted ways to run cluster locally  |
 | [deploy/dev/ansible](/deploy/dev/ansible) | developers | use it for non-containerized development and testing on multiple nodes | [readme](/deploy/dev/ansible/README.md)   |
 | **Docker** | --- | --- | --- |
 | [deploy/dev/docker](/deploy/dev/docker) | developers | run AIS cluster consisting of one or more `aisnode` containers; use `AIS_ENDPOINT` to test and/or develop with it  | [readme](/deploy/dev/docker/README.md) |

diff --git a/deploy/dev/local/README.md b/deploy/dev/local/README.md
@@ -52,7 +52,7 @@ Note that we are still running everything locally.
 Therefore: remove the previously generated configuration (if any) and redeploy from scratch a minimal cluster consisting of a single gateway and a single target:
 
 ```console
-$ deploy/scripts/clean_deploy.sh --target-cnt 1 --proxy-cnt 1 --mountpath-cnt 0 --deployment local --remote-alias remais --gcp --aws
+$ scripts/clean_deploy.sh --target-cnt 1 --proxy-cnt 1 --mountpath-cnt 0 --deployment local --remote-alias remais --gcp --aws
 
 # or, same:
 $ make kill clean cli deploy <<< $'1\n1\n0\ny\ny\nn\nn\n0\n'

diff --git a/deploy/dev/local/deploy.sh b/deploy/dev/local/deploy.sh
@@ -51,8 +51,11 @@ else
   fi
 fi
 
-AISTORE_PATH=$(cd "$(dirname "$0")/../../../"; pwd -P) # absolute path to aistore directory
+## NOTE: absolute path to aistore root
+## (should we use `git rev-parse --show-toplevel` instead?)
+AISTORE_PATH=$(cd "$(dirname "$0")/../../../"; pwd -P)
 source $AISTORE_PATH/deploy/dev/utils.sh
+
 AIS_USE_HTTPS=${AIS_USE_HTTPS:-false}
 AIS_HTTP_CHUNKED_TRANSFER=true
 HTTP_WRITE_BUFFER_SIZE=65536

diff --git a/docs/cli.md b/docs/cli.md
@@ -76,15 +76,15 @@ $ MODE=debug make cli
 
 Alternatively, install directly from GitHub:
 
-* [Install CLI from release binaries](https://github.com/NVIDIA/aistore/blob/main/deploy/scripts/install_from_binaries.sh)
+* [Install CLI from release binaries](https://github.com/NVIDIA/aistore/blob/main/scripts/install_from_binaries.sh)
 
 For example, the following command extracts CLI binary to the specified destination and, secondly, installs `bash` autocompletions:
 
 ```console
-$ ./deploy/scripts/install_from_binaries.sh --dstdir /tmp/www --completions
+$ ./scripts/install_from_binaries.sh --dstdir /tmp/www --completions
 ```
 
-For more usage options, run: `./deploy/scripts/install_from_binaries.sh --help`
+For more usage options, run: `./scripts/install_from_binaries.sh --help`
 
 You can also install `bash` and/or `zsh` autocompletions separately at any (later) time:
 

diff --git a/docs/cli/help.md b/docs/cli/help.md
@@ -14,7 +14,7 @@ This readme is a loose assortment of quick tips.
 The default destination is /usr/local/bin but here we install into /tmp/www
 
 ```console
-$ deploy/scripts/install_from_binaries.sh --dstdir /tmp/www
+$ scripts/install_from_binaries.sh --dstdir /tmp/www
 Installing aisloader => /tmp/www/aisloader
   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                  Dload  Upload   Total   Spent    Left  Speed
@@ -74,7 +74,7 @@ DESCRIPTION:
    If <TAB-TAB> completion doesn't work:
    * download https://github.com/NVIDIA/aistore/tree/main/cmd/cli/autocomplete
    * run 'cmd/cli/autocomplete/install.sh'
-   To install CLI directly from GitHub: https://github.com/NVIDIA/aistore/blob/main/deploy/scripts/install_from_binaries.sh
+   To install CLI directly from GitHub: https://github.com/NVIDIA/aistore/blob/main/scripts/install_from_binaries.sh
 
 COMMANDS:
    bucket          create/destroy buckets, list bucket's contents, show existing buckets and their properties