Add support for build-bot package manifest value

4 files changed, 450 insertions, 26 deletions

diff --git a/libbpkg/manifest.cxx b/libbpkg/manifest.cxx
index 065f055..bd69b85 100644
--- a/libbpkg/manifest.cxx
+++ b/libbpkg/manifest.cxx
@@ -3383,6 +3383,35 @@ namespace bpkg
     return build_auxiliary (move (env_name), move (v), move (c));
   }
 
+  // Parse the [*-]build-bot manifest value and append it to the specified
+  // custom bot public keys list. Make sure the specified key is not empty and
+  // is not a duplicate and throw parsing if that's not the case.
+  //
+  // Note: value name is not used by this function (and so can be moved out,
+  // etc before the call).
+  //
+  static void
+  parse_build_bot (const name_value& nv, const string& source_name, strings& r)
+  {
+    const string& v (nv.value);
+
+    auto bad_value = [&nv, &source_name, &v] (const string& d,
+                                              bool add_key = true)
+    {
+      throw !source_name.empty ()
+            ? parsing (source_name, nv.value_line, nv.value_column, d)
+            : parsing (!add_key ? d : (d + ":\n" + v));
+    };
+
+    if (v.empty ())
+      bad_value ("empty custom build bot public key", false /* add_key */);
+
+    if (find (r.begin (), r.end (), v) != r.end ())
+      bad_value ("duplicate custom build bot public key");
+
+    r.push_back (v);
+  }
+
   const version stub_version (0, "0", nullopt, nullopt, 0);
 
   // Parse until next() returns end-of-manifest value.
@@ -4118,6 +4147,10 @@ namespace bpkg
           parse_build_auxiliary (nv, move (ba->second), bc.auxiliaries);
         }
       }
+      else if (n == "build-bot")
+      {
+        parse_build_bot (nv, name, m.build_bot_keys);
+      }
       else if (n.size () > 13 &&
                n.compare (n.size () - 13, 13, "-build-config") == 0)
       {
@@ -4162,6 +4195,14 @@ namespace bpkg
         bc.constraints.push_back (
           parse_build_constraint (nv, true /* exclusion */, name));
       }
+      else if (n.size () > 10 &&
+               n.compare (n.size () - 10, 10, "-build-bot") == 0)
+      {
+        n.resize (n.size () - 10);
+
+        build_package_config& bc (build_conf (move (n)));
+        parse_build_bot (nv, name, bc.bot_keys);
+      }
       else if (n.size () > 12 &&
                n.compare (n.size () - 12, 12, "-build-email") == 0)
       {
@@ -4908,6 +4949,14 @@ namespace bpkg
     //
     const manifest_name_value* pbc  (nullptr);
 
+    // The first {build-bot} override value.
+    //
+    const manifest_name_value* cbb (nullptr);
+
+    // The first {*-build-bot} override value.
+    //
+    const manifest_name_value* pbb  (nullptr);
+
     // The first {build-*email} override value.
     //
     const manifest_name_value* cbe (nullptr);
@@ -4922,6 +4971,10 @@ namespace bpkg
     //
     vector<pair<size_t, bool>> obcs;
 
+    // List of indexes of the build configurations with the overridden bots.
+    //
+    vector<size_t> obbs;
+
     // List of indexes of the build configurations with the overridden emails.
     //
     vector<size_t> obes;
@@ -4983,7 +5036,7 @@ namespace bpkg
       // otherwise.
       //
       // The n argument specifies the length of the configuration name in
-      // *-build-config, *-builds, *-build-{include,exclude}, and
+      // *-build-config, *-builds, *-build-{include,exclude}, *-build-bot, and
       // *-build-*email values.
       //
       auto build_conf =
@@ -5020,7 +5073,9 @@ namespace bpkg
       // the build config-specific builds group value override, if exists. If
       // no configuration matches, then throw manifest_parsing, except for the
       // validate-only mode in which case just add an empty configuration with
-      // this name and return the reference to it.
+      // this name and return the reference to it. Also verify that no common
+      // build constraints group value overrides are applied yet and throw if
+      // that's not the case.
       //
       auto build_conf_constr =
         [&pbc, &cbc, &nv, &obcs, &bad_name, &build_conf, &m, validate_only]
@@ -5085,6 +5140,75 @@ namespace bpkg
         return r;
       };
 
+      // Reset the {build-bot} value group on the first call but throw if any
+      // of the {*-build-bot} override values are already encountered.
+      //
+      auto reset_build_bots = [&cbb, &pbb, &nv, &bad_name, &m] ()
+      {
+        if (cbb == nullptr)
+        {
+          if (pbb != nullptr)
+            bad_name ('\'' + nv.name + "' override specified together with '" +
+                      pbb->name + "' override");
+
+          m.build_bot_keys.clear ();
+          cbb = &nv;
+        }
+      };
+
+      // Return the reference to the package build configuration which matches
+      // the build config-specific build bot value override, if exists. If no
+      // configuration matches, then throw manifest_parsing, except for the
+      // validate-only mode in which case just add an empty configuration with
+      // this name and return the reference to it. Also verify that no common
+      // build bot value overrides are applied yet and throw if that's not the
+      // case.
+      //
+      auto build_conf_bot =
+        [&pbb, &cbb, &nv, &obbs, &bad_name, &build_conf, &m, validate_only]
+        (size_t n) -> build_package_config&
+      {
+        const string& nm (nv.name);
+
+        // If this is the first build config override value, then save its
+        // address. But first verify that no common build bot value overrides
+        // are applied yet and throw if that's not the case.
+        //
+        if (pbb == nullptr)
+        {
+          if (cbb != nullptr)
+            bad_name ('\'' + nm + "' override specified together with '" +
+                      cbb->name + "' override");
+
+          pbb = &nv;
+        }
+
+        small_vector<build_package_config, 1>& cs (m.build_configs);
+
+        // Find the build package configuration. If there is no such a
+        // configuration then throw, except for the validate-only mode in
+        // which case just add an empty configuration with this name.
+        //
+        // Note that we are using indexes rather then configuration addresses
+        // due to potential reallocations.
+        //
+        build_package_config& r (build_conf (n, validate_only));
+        size_t ci (&r - cs.data ());
+
+        // If this is the first encountered {*-build-bot} override for this
+        // build config, then clear this config' bot_keys members and add an
+        // entry to the overridden configs list.
+        //
+        if (find (obbs.begin (), obbs.end (), ci) == obbs.end ())
+        {
+          r.bot_keys.clear ();
+
+          obbs.push_back (ci);
+        }
+
+        return r;
+      };
+
       // Reset the {build-*email} value group on the first call but throw if
       // any of the {*-build-*email} override values are already encountered.
       //
@@ -5107,7 +5231,9 @@ namespace bpkg
       // the build config-specific emails group value override, if exists. If
       // no configuration matches, then throw manifest_parsing, except for the
       // validate-only mode in which case just add an empty configuration with
-      // this name and return the reference to it.
+      // this name and return the reference to it. Also verify that no common
+      // build emails group value overrides are applied yet and throw if
+      // that's not the case.
       //
       auto build_conf_email =
         [&pbe, &cbe, &nv, &obes, &bad_name, &build_conf, &m, validate_only]
@@ -5218,6 +5344,12 @@ namespace bpkg
         m.build_constraints.push_back (
           parse_build_constraint (nv, true /* exclusion */, name));
       }
+      else if (n == "build-bot")
+      {
+        reset_build_bots ();
+
+        parse_build_bot (nv, name, m.build_bot_keys);
+      }
       else if ((n.size () > 13 &&
                 n.compare (n.size () - 13, 13, "-build-config") == 0))
       {
@@ -5252,6 +5384,12 @@ namespace bpkg
         bc.constraints.push_back (
           parse_build_constraint (nv, true /* exclusion */, name));
       }
+      else if (n.size () > 10 &&
+               n.compare (n.size () - 10, 10, "-build-bot") == 0)
+      {
+        build_package_config& bc (build_conf_bot (n.size () - 10));
+        parse_build_bot (nv, name, bc.bot_keys);
+      }
       else if (n == "build-email")
       {
         reset_build_emails ();
@@ -5315,8 +5453,9 @@ namespace bpkg
     assert (cbc == nullptr || pbc == nullptr);
 
     // Now, if not in the validate-only mode, as all the potential build
-    // constraint/email overrides are applied, perform the final adjustments
-    // to the build config constraints/emails.
+    // constraint, bot keys, and email overrides are applied, perform the
+    // final adjustments to the build config constraints, bot keys, and
+    // emails.
     //
     if (!validate_only)
     {
@@ -5345,6 +5484,12 @@ namespace bpkg
         }
       }
 
+      if (cbb != nullptr)      // Common build bots are overridden?
+      {
+        for (build_package_config& c: m.build_configs)
+          c.bot_keys.clear ();
+      }
+
       if (cbe != nullptr)      // Common build emails are overridden?
       {
         for (build_package_config& c: m.build_configs)
@@ -5682,6 +5827,9 @@ namespace bpkg
                  : "build-auxiliary"),
                 serializer::merge_comment (ba.config, ba.comment));
 
+      for (const string& k: m.build_bot_keys)
+        s.next ("build-bot", k);
+
       for (const build_package_config& bc: m.build_configs)
       {
         if (!bc.builds.empty ())
@@ -5715,6 +5863,14 @@ namespace bpkg
                     serializer::merge_comment (ba.config, ba.comment));
         }
 
+        if (!bc.bot_keys.empty ())
+        {
+          string n (bc.name + "-build-bot");
+
+          for (const string& k: bc.bot_keys)
+            s.next (n, k);
+        }
+
         if (!bc.arguments.empty () || !bc.comment.empty ())
           s.next (bc.name + "-build-config",
                   serializer::merge_comment (bc.arguments, bc.comment));
diff --git a/libbpkg/manifest.hxx b/libbpkg/manifest.hxx
index 4b0ccc6..feb3b96 100644
--- a/libbpkg/manifest.hxx
+++ b/libbpkg/manifest.hxx
@@ -1014,13 +1014,21 @@ namespace bpkg
   };
 
   // Package build configuration. Includes comment and optional overrides for
-  // target build configuration class expressions/constraints and build
-  // notification emails.
+  // target build configuration class expressions/constraints, auxiliaries,
+  // custom bot public keys, and notification emails.
   //
-  class build_package_config
+  // Note that in the package manifest the build bot keys list contains the
+  // public keys data (std::string type). However, for other use cases it may
+  // be convenient to store some other key representations (public key object
+  // pointers represented as key fingerprints, etc; see brep for such a use
+  // case).
+  //
+  template <typename K>
+  class build_package_config_template
   {
   public:
     using email_type = bpkg::email;
+    using key_type = K;
 
     std::string name;
 
@@ -1040,16 +1048,39 @@ namespace bpkg
     //
     std::vector<build_auxiliary> auxiliaries;
 
+    std::vector<key_type> bot_keys;
+
     butl::optional<email_type> email;
     butl::optional<email_type> warning_email;
     butl::optional<email_type> error_email;
 
-    build_package_config () = default;
+    build_package_config_template () = default;
+
+    build_package_config_template (std::string n,
+                                   std::string a,
+                                   std::string c,
+                                   butl::small_vector<build_class_expr, 1> bs,
+                                   std::vector<build_constraint> cs,
+                                   std::vector<build_auxiliary> as,
+                                   std::vector<key_type> bks,
+                                   butl::optional<email_type> e,
+                                   butl::optional<email_type> we,
+                                   butl::optional<email_type> ee)
+        : name (move (n)),
+          arguments (move (a)),
+          comment (move (c)),
+          builds (move (bs)),
+          constraints (move (cs)),
+          auxiliaries (move (as)),
+          bot_keys (move (bks)),
+          email (move (e)),
+          warning_email (move (we)),
+          error_email (move (ee)) {}
 
     // Built incrementally.
     //
     explicit
-    build_package_config (std::string n): name (move (n)) {}
+    build_package_config_template (std::string n): name (move (n)) {}
 
     // Return the configuration's build class expressions/constraints if they
     // override the specified common expressions/constraints and return the
@@ -1080,6 +1111,15 @@ namespace bpkg
       return !auxiliaries.empty () ? auxiliaries : common;
     }
 
+    // Return the configuration's custom bot public keys, if specified, and
+    // the common ones otherwise.
+    //
+    const std::vector<key_type>&
+    effective_bot_keys (const std::vector<key_type>& common) const noexcept
+    {
+      return !bot_keys.empty () ? bot_keys : common;
+    }
+
     // Return the configuration's build notification emails if they override
     // the specified common build notification emails and return the latter
     // otherwise (see package_manifest::override() for the override semantics
@@ -1106,6 +1146,8 @@ namespace bpkg
     }
   };
 
+  using build_package_config = build_package_config_template<std::string>;
+
   enum class test_dependency_type
   {
     tests,
@@ -1253,8 +1295,8 @@ namespace bpkg
     std::vector<requirement_alternatives> requirements;
     butl::small_vector<test_dependency, 1> tests;
 
-    // Common build classes, constraints, and auxiliaries that apply to all
-    // configurations unless overridden.
+    // Common build classes, constraints, auxiliaries, and custom bot public
+    // keys that apply to all configurations unless overridden.
     //
     // Note that all entries in build_auxiliaries must have distinct
     // environment names (with empty name being one of the possibilities).
@@ -1262,6 +1304,7 @@ namespace bpkg
     butl::small_vector<build_class_expr, 1> builds;
     std::vector<build_constraint> build_constraints;
     std::vector<build_auxiliary> build_auxiliaries;
+    strings build_bot_keys;
 
     // Note that the parsing constructor adds the implied (empty) default
     // configuration at the beginning of the list. Also note that serialize()
@@ -1418,20 +1461,22 @@ namespace bpkg
     //
     //   {build-*email}
     //   {builds, build-{include,exclude}}
+    //   {build-bot}
     //   {*-builds, *-build-{include,exclude}}
+    //   {*-build-bot}
     //   {*-build-config}
     //   {*-build-*email}
     //
     //   [*-]build-auxiliary[-*]
     //
     // Throw manifest_parsing if the configuration specified by the build
-    // package configuration-specific build constraint, email, or auxiliary
-    // value override doesn't exists. In contrast, for the build config
-    // override add a new configuration if it doesn't exist and update the
-    // arguments of the existing configuration otherwise. In the former case,
-    // all the potential build constraint, email, and auxiliary overrides for
-    // such a newly added configuration must follow the respective
-    // *-build-config override.
+    // package configuration-specific build constraint, email, auxiliary, or
+    // custom bot public key value override doesn't exists. In contrast, for
+    // the build config override add a new configuration if it doesn't exist
+    // and update the arguments of the existing configuration otherwise. In
+    // the former case, all the potential build constraint, email, auxiliary,
+    // and bot key overrides for such a newly added configuration must follow
+    // the respective *-build-config override.
     //
     // Note that the build constraints group values (both common and build
     // config-specific) are overridden hierarchically so that the
@@ -1446,13 +1491,20 @@ namespace bpkg
     // constraints are reset to `builds: none`.
     //
     // Similar to the build constraints groups, the common and build
-    // config-specific build emails group value overrides are mutually
-    // exclusive. If the common build emails are overridden, then all the
-    // build config-specific emails are reset to nullopt. Otherwise, if some
-    // build config-specific emails are overridden, then for the remaining
-    // configs the email is reset to the empty value and the warning and error
-    // emails are reset to nullopt (which effectively disables email
-    // notifications for such configurations).
+    // config-specific custom bot key value overrides are mutually
+    // exclusive. If the common custom bot keys are overridden, then all the
+    // build config-specific custom bot keys are removed. Otherwise, if some
+    // build config-specific custom bot keys are overridden, then for the
+    // remaining configs the custom bot keys are left unchanged.
+    //
+    // Similar to the above, the common and build config-specific build emails
+    // group value overrides are mutually exclusive. If the common build
+    // emails are overridden, then all the build config-specific emails are
+    // reset to nullopt. Otherwise, if some build config-specific emails are
+    // overridden, then for the remaining configs the email is reset to the
+    // empty value and the warning and error emails are reset to nullopt
+    // (which effectively disables email notifications for such
+    // configurations).
     //
     // If a non-empty source name is specified, then the specified values are
     // assumed to also include the line/column information and the possibly
diff --git a/tests/manifest/testscript b/tests/manifest/testscript
index 488668c..d7ec37f 100644
--- a/tests/manifest/testscript
+++ b/tests/manifest/testscript
@@ -1158,6 +1158,115 @@
     }
   }
 
+  : build-bot
+  :
+  {
+    : basics
+    :
+    {
+      $* <<EOF >>EOF
+        : 1
+        name: foo
+        version: 2.0.0
+        summary: Modern C++ parser
+        license: LGPLv2
+        build-bot:\
+        -----BEGIN PUBLIC KEY-----
+        MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw5liP5pyU9ebC/nD3djZ
+        1H2dlKmUyiX0Z8POvKhLREd0B3rM59bPcnbRB4HMIhj0J0hUBvS8xb4u5udCPToa
+        x0A/LMWZ6claiivNtJ3CdLV98eklWdNUg5WXOuqq9QDKXw2ZpGbwDwCOh6aHSWVq
+        98N9AQx0ZMmMWz3qhRyxPfh+GeJ05uj2ohU9FeUJxeqUcgJT/UcMZ3+7KYbwr+Uq
+        /HCoX1BmN6nvzhQGHvJIZ2IcjvOQ0AUrPmpSZN01Zr3ZEpkHM3hJWNLu3ntJLGBQ
+        0aT5kG3iqFyr9q3M3c4J8c0AWrnDjvj0qnCyjNwqW+qIpatmCNT43DmgYr9fQLW0
+        UHusburz53AbXs12zu3gZzkb0irlShatkMqqQaqaU0/+zw1LnoZ+rvmn2XV97UuK
+        LFKMKXCnyi2ZG65IZHGkjBVAPuvsX6RgLNyner/QtkDJTbfhktInbG08dCPqv1EF
+        1OtcYKMTn8I5P2VmMO6SXXDLMSdU8b5DA5EY6Ca6JBB8g06S9sqGqXgQFysAnZs1
+        VFgMopf8WZqj23x+DX+9KKT2pVnjbwRvBAntuCDoO75gWoETDnCQXEei/PbyamPq
+        9+NjNsTDn67iJTGncZbII+eciY2YiFHm6GMzBPsUYlQcxiuO4X36jW6m2rwuw37K
+        oFDbGI3uY4LnhwmDFLbjtk8CAwEAAQ==
+        -----END PUBLIC KEY-----
+        \
+        build-bot:\
+        -----BEGIN PUBLIC KEY-----
+        AIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw5liP5pyU9ebC/nD3djZ
+        2H2dlKmUyiX0Z8POvKhLREd0B3rM59bPcnbRB4HMIhj0J0hUBvS8xb4u5udCPToa
+        x0A/LMWZ6claiivNtJ3CdLV98eklWdNUg5WXOuqq9QDKXw2ZpGbwDwCOh6aHSWVq
+        98N9AQx0ZMmMWz3qhRyxPfh+GeJ05uj2ohU9FeUJxeqUcgJT/UcMZ3+7KYbwr+Uq
+        /HCoX1BmN6nvzhQGHvJIZ2IcjvOQ0AUrPmpSZN01Zr3ZEpkHM3hJWNLu3ntJLGBQ
+        0aT5kG3iqFyr9q3M3c4J8c0AWrnDjvj0qnCyjNwqW+qIpatmCNT43DmgYr9fQLW0
+        UHusburz53AbXs12zu3gZzkb0irlShatkMqqQaqaU0/+zw1LnoZ+rvmn2XV97UuK
+        LFKMKXCnyi2ZG65IZHGkjBVAPuvsX6RgLNyner/QtkDJTbfhktInbG08dCPqv1EF
+        1OtcYKMTn8I5P2VmMO6SXXDLMSdU8b5DA5EY6Ca6JBB8g06S9sqGqXgQFysAnZs1
+        VFgMopf8WZqj23x+DX+9KKT2pVnjbwRvBAntuCDoO75gWoETDnCQXEei/PbyamPq
+        9+NjNsTDn67iJTGncZbII+eciY2YiFHm6GMzBPsUYlQcxiuO4X36jW6m2rwuw37K
+        oFDbGI3uY4LnhwmDFLbjtk8CAwEAAQ==
+        -----END PUBLIC KEY-----
+        \
+        EOF
+    }
+
+    : empty
+    :
+    {
+      $* <<EOI 2>>EOE != 0
+        : 1
+        name: foo
+        version: 2.0.0
+        summary: Modern C++ parser
+        license: LGPLv2
+        build-bot:
+        EOI
+        stdin:6:11: error: empty custom build bot public key
+        EOE
+    }
+
+    : duplicate
+    :
+    {
+      $* <<EOI 2>>EOE != 0
+        : 1
+        name: foo
+        version: 2.0.0
+        summary: Modern C++ parser
+        license: LGPLv2
+        build-bot:\
+        -----BEGIN PUBLIC KEY-----
+        MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw5liP5pyU9ebC/nD3djZ
+        1H2dlKmUyiX0Z8POvKhLREd0B3rM59bPcnbRB4HMIhj0J0hUBvS8xb4u5udCPToa
+        x0A/LMWZ6claiivNtJ3CdLV98eklWdNUg5WXOuqq9QDKXw2ZpGbwDwCOh6aHSWVq
+        98N9AQx0ZMmMWz3qhRyxPfh+GeJ05uj2ohU9FeUJxeqUcgJT/UcMZ3+7KYbwr+Uq
+        /HCoX1BmN6nvzhQGHvJIZ2IcjvOQ0AUrPmpSZN01Zr3ZEpkHM3hJWNLu3ntJLGBQ
+        0aT5kG3iqFyr9q3M3c4J8c0AWrnDjvj0qnCyjNwqW+qIpatmCNT43DmgYr9fQLW0
+        UHusburz53AbXs12zu3gZzkb0irlShatkMqqQaqaU0/+zw1LnoZ+rvmn2XV97UuK
+        LFKMKXCnyi2ZG65IZHGkjBVAPuvsX6RgLNyner/QtkDJTbfhktInbG08dCPqv1EF
+        1OtcYKMTn8I5P2VmMO6SXXDLMSdU8b5DA5EY6Ca6JBB8g06S9sqGqXgQFysAnZs1
+        VFgMopf8WZqj23x+DX+9KKT2pVnjbwRvBAntuCDoO75gWoETDnCQXEei/PbyamPq
+        9+NjNsTDn67iJTGncZbII+eciY2YiFHm6GMzBPsUYlQcxiuO4X36jW6m2rwuw37K
+        oFDbGI3uY4LnhwmDFLbjtk8CAwEAAQ==
+        -----END PUBLIC KEY-----
+        \
+        build-bot:\
+        -----BEGIN PUBLIC KEY-----
+        MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw5liP5pyU9ebC/nD3djZ
+        1H2dlKmUyiX0Z8POvKhLREd0B3rM59bPcnbRB4HMIhj0J0hUBvS8xb4u5udCPToa
+        x0A/LMWZ6claiivNtJ3CdLV98eklWdNUg5WXOuqq9QDKXw2ZpGbwDwCOh6aHSWVq
+        98N9AQx0ZMmMWz3qhRyxPfh+GeJ05uj2ohU9FeUJxeqUcgJT/UcMZ3+7KYbwr+Uq
+        /HCoX1BmN6nvzhQGHvJIZ2IcjvOQ0AUrPmpSZN01Zr3ZEpkHM3hJWNLu3ntJLGBQ
+        0aT5kG3iqFyr9q3M3c4J8c0AWrnDjvj0qnCyjNwqW+qIpatmCNT43DmgYr9fQLW0
+        UHusburz53AbXs12zu3gZzkb0irlShatkMqqQaqaU0/+zw1LnoZ+rvmn2XV97UuK
+        LFKMKXCnyi2ZG65IZHGkjBVAPuvsX6RgLNyner/QtkDJTbfhktInbG08dCPqv1EF
+        1OtcYKMTn8I5P2VmMO6SXXDLMSdU8b5DA5EY6Ca6JBB8g06S9sqGqXgQFysAnZs1
+        VFgMopf8WZqj23x+DX+9KKT2pVnjbwRvBAntuCDoO75gWoETDnCQXEei/PbyamPq
+        9+NjNsTDn67iJTGncZbII+eciY2YiFHm6GMzBPsUYlQcxiuO4X36jW6m2rwuw37K
+        oFDbGI3uY4LnhwmDFLbjtk8CAwEAAQ==
+        -----END PUBLIC KEY-----
+        \
+        EOI
+        stdin:23:1: error: duplicate custom build bot public key
+        EOE
+    }
+  }
+
   : build-config
   :
   {
diff --git a/tests/overrides/testscript b/tests/overrides/testscript
index 60168a4..a903d05 100644
--- a/tests/overrides/testscript
+++ b/tests/overrides/testscript
@@ -332,6 +332,75 @@
       bar-build-auxiliary-pgsql: *-postgresql_16
       EOO
   }
+
+  : build-bot
+  :
+  {
+    : common
+    :
+    $* 'build-bot: key3' 'build-bot: key4' <<EOI >>EOO
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-bot: key1
+      foo-build-bot: key2
+      EOI
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-bot: key3
+      build-bot: key4
+      EOO
+
+    : config
+    :
+    $* 'foo-build-bot: key3' 'foo-build-bot: key4' <<EOI >>EOO
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-bot: key1
+      foo-build-bot: key2
+      EOI
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-bot: key1
+      foo-build-bot: key3
+      foo-build-bot: key4
+      EOO
+
+    : new-config
+    :
+    $* 'bar-build-config:' \
+       'bar-build-bot: key1' \
+       'bar-build-bot: key2' <<EOI >>EOO
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-bot: key1
+      foo-build-bot: key2
+      EOI
+      : 1
+      name: libfoo
+      version: 2.0.0
+      summary: Modern C++ parser
+      license: LGPLv2
+      build-bot: key1
+      foo-build-bot: key2
+      bar-build-bot: key1
+      bar-build-bot: key2
+      EOO
+  }
 }
 
 : invalid
@@ -448,6 +517,44 @@
     cannot override 'deprecated-api-builds' value: no build package configuration 'deprecated-api'
     EOE
 
+  : config-bot-after-built-bot
+  :
+  $* 'build-bot: key1' 'foo-build-bot: key2' <<EOI 2>>EOE != 0
+    : 1
+    name: libfoo
+    version: 2.0.0
+    summary: Modern C++ parser
+    license: LGPLv2
+    foo-build-config:
+    EOI
+    'foo-build-bot' override specified together with 'build-bot' override
+    EOE
+
+  : built-bot-after-config-bot
+  :
+  $* 'foo-build-bot: key1' 'build-bot: key2' <<EOI 2>>EOE != 0
+    : 1
+    name: libfoo
+    version: 2.0.0
+    summary: Modern C++ parser
+    license: LGPLv2
+    foo-build-config:
+    EOI
+    'build-bot' override specified together with 'foo-build-bot' override
+    EOE
+
+  : no-build-bot-config
+  :
+  $* 'foo-build-bot: key1' <<EOI 2>>EOE != 0
+    : 1
+    name: libfoo
+    version: 2.0.0
+    summary: Modern C++ parser
+    license: LGPLv2
+    EOI
+    cannot override 'foo-build-bot' value: no build package configuration 'foo'
+    EOE
+
   : config-email-after-email
   :
   $* 'build-email: foo@example.com' 'network-build-warning-email: warning@example.com' <<EOI 2>>EOE != 0