Use proper name for authmate binary #36
4 changed files with 15 additions and 9 deletions
|
@ -14,11 +14,11 @@ These tests rely on resources and utility modules that have been originally deve
|
||||||
- `make`
|
- `make`
|
||||||
- `sudo cp bin/frostfs-cli /usr/local/bin/frostfs-cli`
|
- `sudo cp bin/frostfs-cli /usr/local/bin/frostfs-cli`
|
||||||
|
|
||||||
2. Install frostfs-authmate
|
2. Install frostfs-s3-authmate
|
||||||
- `git clone git@github.com:TrueCloudLab/frostfs-s3-gw.git`
|
- `git clone git@github.com:TrueCloudLab/frostfs-s3-gw.git`
|
||||||
- `cd frostfs-s3-gw`
|
- `cd frostfs-s3-gw`
|
||||||
- `make`
|
- `make`
|
||||||
- `sudo cp bin/frostfs-s3-authmate /usr/local/bin/frostfs-authmate`
|
- `sudo cp bin/frostfs-s3-authmate /usr/local/bin/frostfs-s3-authmate`
|
||||||
|
|
||||||
3. Install neo-go
|
3. Install neo-go
|
||||||
- `git clone git@github.com:nspcc-dev/neo-go.git`
|
- `git clone git@github.com:nspcc-dev/neo-go.git`
|
||||||
|
|
|
@ -5,7 +5,13 @@ from frostfs_testlib.cli import FrostfsAdm, FrostfsCli
|
||||||
from frostfs_testlib.hosting import Hosting
|
from frostfs_testlib.hosting import Hosting
|
||||||
from frostfs_testlib.shell import Shell
|
from frostfs_testlib.shell import Shell
|
||||||
|
|
||||||
from pytest_tests.resources.common import FROSTFS_ADM_EXEC, FROSTFS_CLI_EXEC, WALLET_CONFIG
|
from pytest_tests.resources.common import (
|
||||||
|
FROSTFS_ADM_EXEC,
|
||||||
|
FROSTFS_AUTHMATE_EXEC,
|
||||||
|
FROSTFS_CLI_EXEC,
|
||||||
|
NEOGO_EXECUTABLE,
|
||||||
|
WALLET_CONFIG,
|
||||||
|
)
|
||||||
|
|
||||||
logger = logging.getLogger("NeoLogger")
|
logger = logging.getLogger("NeoLogger")
|
||||||
|
|
||||||
|
@ -13,18 +19,18 @@ logger = logging.getLogger("NeoLogger")
|
||||||
def get_local_binaries_versions(shell: Shell) -> dict[str, str]:
|
def get_local_binaries_versions(shell: Shell) -> dict[str, str]:
|
||||||
versions = {}
|
versions = {}
|
||||||
|
|
||||||
for binary in ["neo-go", "frostfs-authmate"]:
|
for binary in [NEOGO_EXECUTABLE, FROSTFS_AUTHMATE_EXEC]:
|
||||||
out = shell.exec(f"{binary} --version").stdout
|
out = shell.exec(f"{binary} --version").stdout
|
||||||
versions[binary] = _parse_version(out)
|
versions[binary] = _parse_version(out)
|
||||||
|
|
||||||
frostfs_cli = FrostfsCli(shell, FROSTFS_CLI_EXEC, WALLET_CONFIG)
|
frostfs_cli = FrostfsCli(shell, FROSTFS_CLI_EXEC, WALLET_CONFIG)
|
||||||
versions["frostfs-cli"] = _parse_version(frostfs_cli.version.get().stdout)
|
versions[FROSTFS_CLI_EXEC] = _parse_version(frostfs_cli.version.get().stdout)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
frostfs_adm = FrostfsAdm(shell, FROSTFS_ADM_EXEC)
|
frostfs_adm = FrostfsAdm(shell, FROSTFS_ADM_EXEC)
|
||||||
versions["frostfs-adm"] = _parse_version(frostfs_adm.version.get().stdout)
|
versions[FROSTFS_ADM_EXEC] = _parse_version(frostfs_adm.version.get().stdout)
|
||||||
except RuntimeError:
|
except RuntimeError:
|
||||||
logger.info(f"frostfs-adm not installed")
|
logger.info("frostfs-adm not installed")
|
||||||
|
|
||||||
out = shell.exec("aws --version").stdout
|
out = shell.exec("aws --version").stdout
|
||||||
out_lines = out.split("\n")
|
out_lines = out.split("\n")
|
||||||
|
|
|
@ -33,7 +33,7 @@ WALLET_PASS = os.getenv("WALLET_PASS", "")
|
||||||
# Paths to CLI executables on machine that runs tests
|
# Paths to CLI executables on machine that runs tests
|
||||||
NEOGO_EXECUTABLE = os.getenv("NEOGO_EXECUTABLE", "neo-go")
|
NEOGO_EXECUTABLE = os.getenv("NEOGO_EXECUTABLE", "neo-go")
|
||||||
FROSTFS_CLI_EXEC = os.getenv("FROSTFS_CLI_EXEC", "frostfs-cli")
|
FROSTFS_CLI_EXEC = os.getenv("FROSTFS_CLI_EXEC", "frostfs-cli")
|
||||||
FROSTFS_AUTHMATE_EXEC = os.getenv("FROSTFS_AUTHMATE_EXEC", "frostfs-authmate")
|
FROSTFS_AUTHMATE_EXEC = os.getenv("FROSTFS_AUTHMATE_EXEC", "frostfs-s3-authmate")
|
||||||
FROSTFS_ADM_EXEC = os.getenv("FROSTFS_ADM_EXEC", "frostfs-adm")
|
FROSTFS_ADM_EXEC = os.getenv("FROSTFS_ADM_EXEC", "frostfs-adm")
|
||||||
|
|
||||||
# Config for frostfs-adm utility. Optional if tests are running against devenv
|
# Config for frostfs-adm utility. Optional if tests are running against devenv
|
||||||
|
|
|
@ -12,7 +12,7 @@ from frostfs_testlib.shell.interfaces import InteractiveInput
|
||||||
from pytest_tests.helpers.k6 import K6, LoadParams, LoadResults
|
from pytest_tests.helpers.k6 import K6, LoadParams, LoadResults
|
||||||
from pytest_tests.resources.common import STORAGE_NODE_SERVICE_NAME_REGEX
|
from pytest_tests.resources.common import STORAGE_NODE_SERVICE_NAME_REGEX
|
||||||
|
|
||||||
FROSTFS_AUTHMATE_PATH = "frostfs-authmate"
|
FROSTFS_AUTHMATE_PATH = "frostfs-s3-authmate"
|
||||||
STOPPED_HOSTS = []
|
STOPPED_HOSTS = []
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue