From 04c0a7b60858637d8253ddeb9a654189867e691b Mon Sep 17 00:00:00 2001 From: Junghyun Kim Date: Wed, 23 Nov 2016 11:40:02 +0900 Subject: [PATCH] Package build time is parsed well now. The page build time was parsed in BuildMonitorDB.pm in src_server. Since srcserver is located in a different machine compared to repserver, we should move the parse process to repserver. It is not viable to parse _statistics in plugin/notify_build_monitor of srcserver. Change-Id: Id43bc9eeb2febae678fd23a30b9512d7b1859b02 Signed-off-by: Junghyun Kim --- notify_buildmonitor.pm | 47 +++++++++++++++-------------------------------- notify_trbs.pm | 47 +++++++++++++++-------------------------------- 2 files changed, 30 insertions(+), 64 deletions(-) diff --git a/notify_buildmonitor.pm b/notify_buildmonitor.pm index 1d2151e..87c2222 100644 --- a/notify_buildmonitor.pm +++ b/notify_buildmonitor.pm @@ -19,32 +19,6 @@ sub new { return $self; } -sub trigger_make_dep_graph { - my ($build_project_id, $proj_name, $repo, $arch) = @_; - - # trigger making build_progress graph. - my $jenkinsuri = "$BSConfig::jenkinsserver/job/make_dep_graph/buildWithParameters"; - my $param = { - 'request' => 'POST', - 'uri' => $jenkinsuri, - 'timeout' => 60, - 'maxredirects' => 1, - }; - my $args = { - 'action' => 'build_progress', - 'build_project_id'=>$build_project_id, - 'obs_project' => $proj_name, - 'repo' => $repo, - 'arch' => $arch, - }; - my @para = ("TRIGGER_INFO=".encode_base64(encode_json($args), '')); - print "notify: trigger Jenkins uri=[$jenkinsuri] para=[@para]\n"; - eval { - BSRPC::rpc( $param, undef, @para ); - }; - warn("Jenkins: $@") if $@; -} - sub srcsrv_start { my ($paramRef) = @_; @@ -154,12 +128,15 @@ sub build_unchanged { my $repo = $paramRef->{'repository'}; my $arch = $paramRef->{'arch'}; my $pkg_name = $paramRef->{'package'}; - my $build_result_dir = $paramRef->{'build_result_dir'}; + my $pre_install_time = $paramRef->{'pre_install_time'}; + my $install_time = $paramRef->{'install_time'}; + my $main_build_time = $paramRef->{'main_build_time'}; my $status = "unchanged"; my $config = "test"; - BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, $build_result_dir); + BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, + $pre_install_time, $install_time, $main_build_time); } sub build_success { @@ -169,12 +146,15 @@ sub build_success { my $repo = $paramRef->{'repository'}; my $arch = $paramRef->{'arch'}; my $pkg_name = $paramRef->{'package'}; - my $build_result_dir = $paramRef->{'build_result_dir'}; + my $pre_install_time = $paramRef->{'pre_install_time'}; + my $install_time = $paramRef->{'install_time'}; + my $main_build_time = $paramRef->{'main_build_time'}; my $status = "succeeded"; my $config = "test"; - BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, $build_result_dir); + BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, + $pre_install_time, $install_time, $main_build_time); } sub build_fail { @@ -184,12 +164,15 @@ sub build_fail { my $repo = $paramRef->{'repository'}; my $arch = $paramRef->{'arch'}; my $pkg_name = $paramRef->{'package'}; - my $build_result_dir = $paramRef->{'build_result_dir'}; + my $pre_install_time = $paramRef->{'pre_install_time'}; + my $install_time = $paramRef->{'install_time'}; + my $main_build_time = $paramRef->{'main_build_time'}; my $status = "failed"; my $config = "test"; - BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, $build_result_dir); + BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, + $pre_install_time, $install_time, $main_build_time); } sub build_broken { diff --git a/notify_trbs.pm b/notify_trbs.pm index c387a70..bd67279 100644 --- a/notify_trbs.pm +++ b/notify_trbs.pm @@ -19,32 +19,6 @@ sub new { return $self; } -sub trigger_make_dep_graph { - my ($build_project_id, $proj_name, $repo, $arch) = @_; - - # trigger making build_progress graph. - my $jenkinsuri = "$BSConfig::jenkinsserver/job/make_dep_graph/buildWithParameters"; - my $param = { - 'request' => 'POST', - 'uri' => $jenkinsuri, - 'timeout' => 60, - 'maxredirects' => 1, - }; - my $args = { - 'action' => 'build_progress', - 'build_project_id'=>$build_project_id, - 'obs_project' => $proj_name, - 'repo' => $repo, - 'arch' => $arch, - }; - my @para = ("TRIGGER_INFO=".encode_base64(encode_json($args), '')); - print "notify: trigger Jenkins uri=[$jenkinsuri] para=[@para]\n"; - eval { - BSRPC::rpc( $param, undef, @para ); - }; - warn("Jenkins: $@") if $@; -} - sub srcsrv_start { my ($paramRef) = @_; @@ -154,12 +128,15 @@ sub build_unchanged { my $repo = $paramRef->{'repository'}; my $arch = $paramRef->{'arch'}; my $pkg_name = $paramRef->{'package'}; - my $build_result_dir = $paramRef->{'build_result_dir'}; + my $pre_install_time = $paramRef->{'pre_install_time'}; + my $install_time = $paramRef->{'install_time'}; + my $main_build_time = $paramRef->{'main_build_time'}; my $status = "unchanged"; my $config = "test"; - BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, $build_result_dir); + BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, + $pre_install_time, $install_time, $main_build_time); } sub build_success { @@ -169,12 +146,15 @@ sub build_success { my $repo = $paramRef->{'repository'}; my $arch = $paramRef->{'arch'}; my $pkg_name = $paramRef->{'package'}; - my $build_result_dir = $paramRef->{'build_result_dir'}; + my $pre_install_time = $paramRef->{'pre_install_time'}; + my $install_time = $paramRef->{'install_time'}; + my $main_build_time = $paramRef->{'main_build_time'}; my $status = "succeeded"; my $config = "test"; - BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, $build_result_dir); + BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, + $pre_install_time, $install_time, $main_build_time); } sub build_fail { @@ -184,12 +164,15 @@ sub build_fail { my $repo = $paramRef->{'repository'}; my $arch = $paramRef->{'arch'}; my $pkg_name = $paramRef->{'package'}; - my $build_result_dir = $paramRef->{'build_result_dir'}; + my $pre_install_time = $paramRef->{'pre_install_time'}; + my $install_time = $paramRef->{'install_time'}; + my $main_build_time = $paramRef->{'main_build_time'}; my $status = "failed"; my $config = "test"; - BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, $build_result_dir); + BuildMonitorDB::package_build_finished($config, $proj_name, $repo, $arch, $pkg_name, $status, + $pre_install_time, $install_time, $main_build_time); } sub build_broken { -- 2.7.4