diff options
| -rw-r--r-- | .circleci/config.yml | 6 | ||||
| -rwxr-xr-x | scripts/entrypoint.pl | 13 |
2 files changed, 0 insertions, 19 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index a70ea3ca6..ed6ce4094 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,12 +37,6 @@ defaults: BMO_memcached_servers: localhost:11211 BMO_memcached_namespace: "bugzilla:" BMO_urlbase: AUTOMATIC - HTTPD_StartServers: 1 - HTTPD_MinSpareServers: 1 - HTTPD_MaxSpareServers: 1 - HTTPD_ServerLimit: 1 - HTTPD_MaxClients: 1 - HTTPD_MaxRequestsPerChild: 4000 mysql_env: &mysql_env MYSQL_DATABASE: bugs diff --git a/scripts/entrypoint.pl b/scripts/entrypoint.pl index e5ecc4324..21d9aebb1 100755 --- a/scripts/entrypoint.pl +++ b/scripts/entrypoint.pl @@ -83,7 +83,6 @@ sub cmd_demo { sub cmd_httpd { check_data_dir(); wait_for_db(); - check_httpd_env(); my $httpd_exit_f = run_cereal_and_httpd(); assert_httpd()->get(); @@ -208,8 +207,6 @@ sub cmd_test_bmo { sub run_prove { my (%param) = @_; - check_httpd_env(); - my $prove_cmd = $param{prove_cmd}; my $prove_dir = $param{prove_dir}; assert_httpd()->then(sub { @@ -269,16 +266,6 @@ sub check_env { die 'Missing required environmental variables: ', join(', ', @missing_env), "\n"; } } -sub check_httpd_env { - check_env(qw( - HTTPD_StartServers - HTTPD_MinSpareServers - HTTPD_MaxSpareServers - HTTPD_ServerLimit - HTTPD_MaxClients - HTTPD_MaxRequestsPerChild - )) -} sub fix_path { $ENV{PATH} = "/app/local/bin:$ENV{PATH}"; |