Revert changes (return DOCKER_IMAGE_YDBD_PACKAGE_SPEC as default)

maximyurchuk · Apr 15, 2024 · 108cfe3 · 108cfe3
1 parent 9aaa2c1
commit 108cfe3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/ydb/tools/ydbd_slice/__init__.py b/ydb/tools/ydbd_slice/__init__.py
@@ -239,7 +239,6 @@
 '''
 
 
-KIKIMR_EXECUTABLE = 'kikimr/driver/kikimr'
 YDBD_EXECUTABLE = 'ydb/apps/ydbd/ydbd'
 
 
@@ -383,12 +382,9 @@ def arcadia_root(begin_path='.'):
 def deduce_kikimr_bin_from_args(args):
     if args.kikimr is not None:
         path = os.path.abspath(args.kikimr)
-    elif args.ydbd:
-        root = arcadia_root()
-        path = ya_build(root, YDBD_EXECUTABLE, args.build_args, args.dry_run)
     elif args.arcadia:
         root = arcadia_root()
-        path = ya_build(root, KIKIMR_EXECUTABLE, args.build_args, args.dry_run)
+        path = ya_build(root, YDBD_EXECUTABLE, args.build_args, args.dry_run)
     else:
         sys.exit("unable to deduce kikimr bin")
 
@@ -465,11 +461,6 @@ def binaries_args():
         metavar="PATH",
         help="explicit path to compressed kikimr binary file used for transfer acceleration"
     )
-    args.add_argument(
-        "--ydbd",
-        action='store_true',
-        help="build ydb/apps/ydbd/ydbd binary from arcadia, figure out root by finding .arcadia.root upstairs"
-    )
     args.add_argument(
         "--arcadia",
         action='store_true',
@@ -684,10 +675,7 @@ def _run(args):
 # docker and kube scenarios
 def build_and_push_docker_image(build_args, docker_package, build_ydbd, image, force_rebuild):
     if docker_package is None:
-        if build_ydbd:
-            docker_package = docker.DOCKER_IMAGE_YDBD_PACKAGE_SPEC
-        else:
-            docker_package = docker.DOCKER_IMAGE_KIKIMR_PACKAGE_SPEC
+        docker_package = docker.DOCKER_IMAGE_YDBD_PACKAGE_SPEC
 
     logger.debug(f'using docker package spec: {docker_package}')
 
@@ -715,11 +703,6 @@ def add_arguments_docker_build_with_remainder(mode, add_force_rebuild=False):
             help='Force rebuild docker image even if it is already present on host.',
             action='store_true',
         )
-    group.add_argument(
-        "--ydbd",
-        action='store_true',
-        help="build docker image with ydb/apps/ydbd/ydbd binary from arcadia, figure out root by finding .arcadia.root upstairs"
-    )
     group.add_argument(
         '-d', '--docker-package',
         help='Optional: path to docker package description file relative from ARCADIA_ROOT.',
@@ -746,7 +729,7 @@ def _run(args):
         logger.debug("starting docker-build cmd with args '%s'", args)
         try:
             image = docker.get_image_from_args(args)
-            build_and_push_docker_image(args.build_args, args.docker_package, args.ydbd, image, force_rebuild=True)
+            build_and_push_docker_image(args.build_args, args.docker_package, False, image, force_rebuild=True)
 
             logger.info('docker-build finished')
         except RuntimeError as e:
@@ -822,7 +805,7 @@ def _run(args):
         try:
             image = docker.get_image_from_args(args)
             if not args.use_prebuilt_image:
-                build_and_push_docker_image(args.build_args, args.docker_package, args.ydbd, image, force_rebuild=args.force_rebuild)
+                build_and_push_docker_image(args.build_args, args.docker_package, False, image, force_rebuild=args.force_rebuild)
 
             manifests = kube_handlers.get_all_manifests(args.path)
             kube_handlers.manifests_ydb_set_image(args.path, manifests, image)
@@ -869,7 +852,7 @@ def _run(args):
         try:
             image = docker.get_image_from_args(args)
             if not args.use_prebuilt_image:
-                build_and_push_docker_image(args.build_args, args.docker_package, args.ydbd, image, force_rebuild=args.force_rebuild)
+                build_and_push_docker_image(args.build_args, args.docker_package, False, image, force_rebuild=args.force_rebuild)
 
             manifests = kube_handlers.get_all_manifests(args.path)
             manifests = kube_handlers.manifests_ydb_filter_components(args.path, manifests, args.components)

diff --git a/ydb/tools/ydbd_slice/kube/docker.py b/ydb/tools/ydbd_slice/kube/docker.py
@@ -9,7 +9,6 @@
 
 
 DOCKER_IMAGE_YDBD_PACKAGE_SPEC = 'ydb/tools/ydbd_slice/image/pkg.json'
-DOCKER_IMAGE_KIKIMR_PACKAGE_SPEC = None  # it is set up on runtime from arcadia source code
 DOCKER_IMAGE_REGISTRY = 'cr.yandex'
 DOCKER_IMAGE_REPOSITORY = 'crpbo4q9lbgkn85vr1rm'
 DOCKER_IMAGE_NAME = 'ydb'