SERVER-111404 Adjust directory for create_rbe_sysroot (#41836)

GitOrigin-RevId: 68070626dd8eb2de0a31dc859415a931aa4d184e

buildscripts/create_rbe_sysroot.py

@@ -30,7 +30,7 @@ def main():
 
     os.makedirs("./rbe_sysroot", exist_ok=True)
 
-    subprocess.run(["sudo", container_cli, "cp", f"{cid}:/", "./rbe_sysroot/"], check=True)
+    subprocess.run([container_cli, "cp", f"{cid}:/", "./rbe_sysroot/"], check=True)
 
     user = getpass.getuser()
     subprocess.run(["sudo", "chown", "-R", f"{user}:{user}", "./rbe_sysroot"], check=True)

buildscripts/print_local_rbe_container_url.py

@@ -6,7 +6,7 @@ import sys
 if __name__ == "__main__" and __package__ is None:
     sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from buildscripts.print_local_rbe_container_url import calculate_local_rbe_container_url
+from buildscripts.local_rbe_container_url import calculate_local_rbe_container_url
 
 
 def main():

buildscripts/setup_spawnhost_coredump

@@ -60,6 +60,14 @@ if [ -f $ARTIFACTS_SCRIPT ]; then
     $python $ARTIFACTS_SCRIPT
 fi
 
+RBE_SYSROOT_SCRIPT="${SRC_DIR}/buildscripts/create_rbe_sysroot.py"
+if [[ -f "${RBE_SYSROOT_SCRIPT}" ]]; then
+    echo "Setting up RBE sysroot for unit test debugging..."
+    $python $RBE_SYSROOT_SCRIPT
+else
+    echo "Failed to find RBE sysroot setup script."
+fi
+
 archive_fail() {
     echo "Error: archive [${1}] not found." >&2
 }
@@ -259,14 +267,6 @@ fi' >> .bash_profile
         archive_fail "src"
     fi
 
-    RBE_SYSROOT_SCRIPT="${SRC_DIR}/buildscripts/create_rbe_sysroot.py"
-    if [[ -f "${RBE_SYSROOT_SCRIPT}" ]]; then
-        echo "Setting up RBE sysroot for unit test debugging..."
-        $python $RBE_SYSROOT_SCRIPT
-    else
-        echo "Failed to find RBE sysroot setup script."
-    fi
-
     set -x
 
     # logic for core dumps uploaded together in a .tar.gz file