From b4d4fe0e1833ce63ca3df40687d0442a40b1c1ce Mon Sep 17 00:00:00 2001
From: Alexey Spiridonov <lesha@fb.com>
Date: Sun, 3 Apr 2022 20:54:31 -0700
Subject: [PATCH] Remove mentions of Bistro

Summary: Since Bistro is slated to be deprecated, let us turn off OSS CI for it.

Reviewed By: AnonymousMonkey2021

Differential Revision: D35347845

fbshipit-source-id: be23bcfaa098f77162f27ecfed6469b8db7d3401
---
 build/fbcode_builder/getdeps/builder.py  | 50 ------------------------
 build/fbcode_builder/getdeps/manifest.py | 11 ------
 build/fbcode_builder/manifests/bistro    | 28 -------------
 build/fbcode_builder/specs/fmt.py        |  5 +--
 build/fbcode_builder/specs/proxygen.py   |  2 +-
 5 files changed, 2 insertions(+), 94 deletions(-)
 delete mode 100644 build/fbcode_builder/manifests/bistro

diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py
index 48a501fae..c05686215 100644
--- a/build/fbcode_builder/getdeps/builder.py
+++ b/build/fbcode_builder/getdeps/builder.py
@@ -355,56 +355,6 @@ class Iproute2Builder(BuilderBase):
         self._run_cmd(install_cmd, env=env)
 
 
-class BistroBuilder(BuilderBase):
-    def _build(self, install_dirs, reconfigure) -> None:
-        p = os.path.join(self.src_dir, "bistro", "bistro")
-        env = self._compute_env(install_dirs)
-        env["PATH"] = env["PATH"] + ":" + os.path.join(p, "bin")
-        env["TEMPLATES_PATH"] = os.path.join(p, "include", "thrift", "templates")
-        self._run_cmd(
-            [
-                os.path.join(".", "cmake", "run-cmake.sh"),
-                "Release",
-                "-DCMAKE_INSTALL_PREFIX=" + self.inst_dir,
-            ],
-            cwd=p,
-            env=env,
-        )
-        self._run_cmd(
-            [
-                "make",
-                "install",
-                "-j",
-                str(self.num_jobs),
-            ],
-            cwd=os.path.join(p, "cmake", "Release"),
-            env=env,
-        )
-
-    def run_tests(
-        self, install_dirs, schedule_type, owner, test_filter, retry, no_testpilot
-    ) -> None:
-        env = self._compute_env(install_dirs)
-        build_dir = os.path.join(self.src_dir, "bistro", "bistro", "cmake", "Release")
-        NUM_RETRIES = 5
-        for i in range(NUM_RETRIES):
-            cmd = ["ctest", "--output-on-failure"]
-            if i > 0:
-                cmd.append("--rerun-failed")
-            cmd.append(build_dir)
-            try:
-                self._run_cmd(
-                    cmd,
-                    cwd=build_dir,
-                    env=env,
-                )
-            except Exception:
-                print(f"Tests failed... retrying ({i+1}/{NUM_RETRIES})")
-            else:
-                return
-        raise Exception(f"Tests failed even after {NUM_RETRIES} retries")
-
-
 class CMakeBuilder(BuilderBase):
     MANUAL_BUILD_SCRIPT = """\
 #!{sys.executable}
diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py
index b9e29fa4e..830284307 100644
--- a/build/fbcode_builder/getdeps/manifest.py
+++ b/build/fbcode_builder/getdeps/manifest.py
@@ -12,7 +12,6 @@ from .builder import (
     AutoconfBuilder,
     Boost,
     CMakeBuilder,
-    BistroBuilder,
     Iproute2Builder,
     MakeBuilder,
     NinjaBootstrap,
@@ -532,16 +531,6 @@ class ManifestParser(object):
                 args += extra_b2_args
             return Boost(build_options, ctx, self, src_dir, build_dir, inst_dir, args)
 
-        if builder == "bistro":
-            return BistroBuilder(
-                build_options,
-                ctx,
-                self,
-                src_dir,
-                build_dir,
-                inst_dir,
-            )
-
         if builder == "cmake":
             defines = self.get_section_as_dict("cmake.defines", ctx)
             return CMakeBuilder(
diff --git a/build/fbcode_builder/manifests/bistro b/build/fbcode_builder/manifests/bistro
deleted file mode 100644
index bcd87ce71..000000000
--- a/build/fbcode_builder/manifests/bistro
+++ /dev/null
@@ -1,28 +0,0 @@
-[manifest]
-name = bistro
-fbsource_path = fbcode/bistro
-shipit_project = bistro
-shipit_fbcode_builder = true
-
-[git]
-repo_url = https://github.com/facebook/bistro.git
-
-[build.os=linux]
-builder = bistro
-
-# Bistro is Linux-specific
-[build.not(os=linux)]
-builder = nop
-
-[dependencies]
-fmt
-folly
-proxygen
-fbthrift
-libsodium
-googletest
-sqlite3
-
-[shipit.pathmap]
-fbcode/bistro/public_tld = .
-fbcode/bistro = bistro
diff --git a/build/fbcode_builder/specs/fmt.py b/build/fbcode_builder/specs/fmt.py
index deca24774..99968c7bb 100644
--- a/build/fbcode_builder/specs/fmt.py
+++ b/build/fbcode_builder/specs/fmt.py
@@ -7,10 +7,7 @@ def fbcode_builder_spec(builder):
     builder.add_option(
         "fmtlib/fmt:cmake_defines",
         {
-            # Avoids a bizarred failure to run tests in Bistro:
-            #   test_crontab_selector: error while loading shared libraries:
-            #   libfmt.so.6: cannot open shared object file:
-            #   No such file or directory
+            # NB: May no longer be needed since Bistro is gone.
             "BUILD_SHARED_LIBS": "OFF",
         },
     )
diff --git a/build/fbcode_builder/specs/proxygen.py b/build/fbcode_builder/specs/proxygen.py
index a3a4b4549..b174e76d7 100644
--- a/build/fbcode_builder/specs/proxygen.py
+++ b/build/fbcode_builder/specs/proxygen.py
@@ -20,7 +20,7 @@ def fbcode_builder_spec(builder):
             # These 2 are set to ON in `proxygen_quic.py`
             "BUILD_QUIC": "OFF",
             "BUILD_TESTS": "OFF",
-            # For bistro
+            # NB May no longer be needed now that Bistro is gone.
             "BUILD_SHARED_LIBS": "OFF",
         },
     )