Merge branch 'master' into unstable

1 files changed, 8 insertions, 0 deletions

diff --git a/scripts/entrypoint.pl b/scripts/entrypoint.pl
index d5612dd85..350dcac8e 100755
--- a/scripts/entrypoint.pl
+++ b/scripts/entrypoint.pl
@@ -10,6 +10,7 @@ use Bugzilla::Install::Util qw(install_string);
 use Bugzilla::Test::Util qw(create_user);
 use Bugzilla::DaemonControl qw(
     run_cereal_and_httpd
+    run_cereal_and_jobqueue
     assert_httpd assert_database assert_selenium
     on_finish on_exception
 );
@@ -89,6 +90,13 @@ sub cmd_httpd  {
     exit $httpd_exit_f->get();
 }
 
+sub cmd_jobqueue {
+    my (@args) = @_;
+    check_data_dir();
+    wait_for_db();
+    exit run_cereal_and_jobqueue(@args)->get;
+}
+
 sub cmd_dev_httpd {
     my $have_params = -f "/app/data/params";
     assert_database->get();