From dbf679bfbc1492c48cdb4b910ea4471766c8783f Mon Sep 17 00:00:00 2001 From: Vladimir Domnich Date: Fri, 15 Jul 2022 09:53:07 +0400 Subject: [PATCH] Add build number to container name per Artem's request. --- Makefile | 4 ++-- pytest_tests/pytest.ini | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 675d4be1..1a983676 100644 --- a/Makefile +++ b/Makefile @@ -116,11 +116,11 @@ setup-for-sbercloud: .PHONY: pytest-docker pytest-docker: -docker ps - -docker rm neofs_tests_py + -docker rm neofs_tests_py$(BUILD_NUMBER) -docker pull $(DEV_IMAGE_PY) docker run -t --rm \ -w /tests \ - --name neofs_tests_py \ + --name neofs_tests_py$(BUILD_NUMBER) \ -e PYTHONPATH="/tests/neofs-keywords/lib:/tests/neofs-keywords/robot:/tests/robot/resources/lib:/tests/robot/resources/lib/python_keywords:/tests/robot/variables:/tests/pytest_tests/helpers" \ -v $(CURDIR):/tests \ -v /var/run/docker.sock:/var/run/docker.sock \ diff --git a/pytest_tests/pytest.ini b/pytest_tests/pytest.ini index cbb3b045..d6a73ad1 100644 --- a/pytest_tests/pytest.ini +++ b/pytest_tests/pytest.ini @@ -10,6 +10,7 @@ markers = sanity: small tests subset staging: test to be excluded from run in verifier/pr-validation/sanity jobs and run test in staging job # functional markers + container: tests for container creation grpc_api: standard gRPC API tests http_gate: HTTP gate contract s3_gate: S3 gate tests