Fix docker command (#5541)

Follow up for #5538 

The previous fix fixed the situation for local environments, but broke
the CI. This PR tries to use another way.
main
Maxim Zhiltsov 3 years ago committed by GitHub
parent cd55616fed
commit 470336e82c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -20,6 +20,7 @@ from deepdiff import DeepDiff
from PIL import Image from PIL import Image
import shared.utils.s3 as s3 import shared.utils.s3 as s3
from shared.fixtures.init import get_server_image_tag
from shared.utils.config import get_method, make_api_client, patch_method from shared.utils.config import get_method, make_api_client, patch_method
from shared.utils.helpers import generate_image_files from shared.utils.helpers import generate_image_files
@ -745,13 +746,14 @@ class TestPostTaskData:
f"{tmp_dir}:/local", f"{tmp_dir}:/local",
"--entrypoint", "--entrypoint",
"python3", "python3",
"cvat/server:dev", get_server_image_tag(),
"utils/dataset_manifest/create.py", "utils/dataset_manifest/create.py",
"--output-dir", "--output-dir",
"/local", "/local",
"/local", "/local",
] ]
subprocess.run(command, check=True) subprocess.check_output(command)
with open(osp.join(tmp_dir, "manifest.jsonl"), mode="rb") as m_file: with open(osp.join(tmp_dir, "manifest.jsonl"), mode="rb") as m_file:
s3_client.create_file( s3_client.create_file(
data=m_file.read(), data=m_file.read(),

@ -3,6 +3,7 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
import logging import logging
import os
import re import re
from http import HTTPStatus from http import HTTPStatus
from pathlib import Path from pathlib import Path
@ -225,6 +226,10 @@ def kube_restore_data_volumes():
kube_exec_cvat("tar --strip 3 -xjf /tmp/cvat_data.tar.bz2 -C /home/django/data/") kube_exec_cvat("tar --strip 3 -xjf /tmp/cvat_data.tar.bz2 -C /home/django/data/")
def get_server_image_tag():
return f"cvat/server:{os.environ.get('CVAT_VERSION', 'dev')}"
def start_services(rebuild=False): def start_services(rebuild=False):
if any([cn in ["cvat_server", "cvat_db"] for cn in running_containers()]): if any([cn in ["cvat_server", "cvat_db"] for cn in running_containers()]):
pytest.exit( pytest.exit(

Loading…
Cancel
Save