From 4d8c2c743b875772f92722b902cd76c67c7f5597 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Sun, 7 Jul 2019 10:50:04 +0700 Subject: Show pipeline progress We calculate pipeline progress from the count of alive builds. --- .../images/ci_favicons/favicon_status_running_100.png | Bin 0 -> 1228 bytes .../images/ci_favicons/favicon_status_running_25.png | Bin 0 -> 1192 bytes .../images/ci_favicons/favicon_status_running_50.png | Bin 0 -> 1237 bytes .../images/ci_favicons/favicon_status_running_75.png | Bin 0 -> 1208 bytes app/models/ci/build.rb | 8 ++++++++ app/models/ci/pipeline.rb | 4 ++++ app/models/ci/stage.rb | 4 ++++ lib/gitlab/ci/status/running.rb | 16 +++++++++++++++- 8 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 app/assets/images/ci_favicons/favicon_status_running_100.png create mode 100644 app/assets/images/ci_favicons/favicon_status_running_25.png create mode 100644 app/assets/images/ci_favicons/favicon_status_running_50.png create mode 100644 app/assets/images/ci_favicons/favicon_status_running_75.png diff --git a/app/assets/images/ci_favicons/favicon_status_running_100.png b/app/assets/images/ci_favicons/favicon_status_running_100.png new file mode 100644 index 00000000000..fb8a1cb263d Binary files /dev/null and b/app/assets/images/ci_favicons/favicon_status_running_100.png differ diff --git a/app/assets/images/ci_favicons/favicon_status_running_25.png b/app/assets/images/ci_favicons/favicon_status_running_25.png new file mode 100644 index 00000000000..e918a17e601 Binary files /dev/null and b/app/assets/images/ci_favicons/favicon_status_running_25.png differ diff --git a/app/assets/images/ci_favicons/favicon_status_running_50.png b/app/assets/images/ci_favicons/favicon_status_running_50.png new file mode 100644 index 00000000000..141cf2dda6b Binary files /dev/null and b/app/assets/images/ci_favicons/favicon_status_running_50.png differ diff --git a/app/assets/images/ci_favicons/favicon_status_running_75.png b/app/assets/images/ci_favicons/favicon_status_running_75.png new file mode 100644 index 00000000000..a3f3af34cf9 Binary files /dev/null and b/app/assets/images/ci_favicons/favicon_status_running_75.png differ diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 89cc082d0bc..ff790004cfe 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -786,6 +786,14 @@ module Ci :creating end + def self.alive_ratio + sql = <<~SQL + SELECT (#{alive.select('COUNT(*)').to_sql})::float / (#{select('COUNT(*)').to_sql}); + SQL + + ActiveRecord::Base.connection.execute(sql).first.values.first + end + private def successful_deployment_status diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 20ca4a9ab24..95b891ed58e 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -794,6 +794,10 @@ module Ci errors ? errors.full_messages.to_sentence : "" end + def progress + (1.0 - builds.alive_ratio) * 100.0 + end + private def ci_yaml_from_repo diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb index d90339d90dc..f2f6dec8de3 100644 --- a/app/models/ci/stage.rb +++ b/app/models/ci/stage.rb @@ -124,5 +124,9 @@ module Ci def manual_playable? blocked? || skipped? end + + def progress + (1.0 - builds.alive_ratio) * 100.0 + end end end diff --git a/lib/gitlab/ci/status/running.rb b/lib/gitlab/ci/status/running.rb index ac7dd74cdce..014ffc81396 100644 --- a/lib/gitlab/ci/status/running.rb +++ b/lib/gitlab/ci/status/running.rb @@ -17,7 +17,21 @@ module Gitlab end def favicon - 'favicon_status_running' + if subject.respond_to?(:progress) + progress = subject.progress + + if progress < 25.0 + 'favicon_status_running_25' + elsif progress < 50.0 + 'favicon_status_running_50' + elsif progress < 75.0 + 'favicon_status_running_75' + elsif progress < 100.0 + 'favicon_status_running_100' + end + else + 'favicon_status_running' + end end end end -- cgit v1.2.3