Commit cc0f76b47b2fd654efa3f42bd79e638dfe946d36
2023-02-28T11:24:31
ci_mux
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156
diff --git a/lib/rbpkg.rb b/lib/rbpkg.rb
index 76eed8e..845c3c4 100644
--- a/lib/rbpkg.rb
+++ b/lib/rbpkg.rb
@@ -55,16 +55,17 @@ module Rbpkg
def self.ci_mux
verbose(3, "Rbpkg.ci_mux")
- status = {}
- ci_mux_host_status(status)
- ci_mux_status(status)
- log = {}
+ status = ci_mux_status_hosts
+ final_status = ci_mux_status(status)
+ log = ci_mux_log_hosts(status, final_status)
+ ci_mux_log(log)
+ end
+
+ def self.ci_mux_log(log, final_status)
Dir.chdir("#{Rbpkg.ci_dir}/log") do
- ci_mux_log(log)
- log.each do |name, l|
+ log.each do |name, sublogs|
File.open("#{name}.html", "w") do |output|
- status_file = "#{Rbpkg.ci_dir}/status/#{name}.status"
- s = File.read(status_file).strip
+ s = final_status[name]
img = status_img(s)
output.puts <<-EOF
<!DOCTYPE html>
@@ -88,15 +89,13 @@ module Rbpkg
</h1>
<ul class="list-group">
EOF
- Dir["*/*/#{name}.log.html"].each do |subdir_file|
- status_file = "#{Rbpkg.ci_dir}/status/#{subdir_file.gsub(/.log.html$/, ".status")}"
- s = File.read(status_file).strip
- img = status_img(s)
- subdir_file_html = subdir_file.to_html
+ sublogs.each do |d, sublog|
+ sublog.img = status_img(sublog.status)
+ sublog_html = sublog.html.to_html
output.puts <<-EOF
<li class="list-group-item">
- <img src="#{img}" class="status-#{s.to_html}"/>
- <a href="#{subdir_file_html}">#{subdir_file_html}</a>
+ <img src="#{img}" class="status-#{sublog.status.to_s.to_html}"/>
+ <a href="#{sublog_html}">#{sublog_html}</a>
</li>
EOF
end
@@ -110,54 +109,75 @@ EOF
end
end
- def self.ci_mux_log(logs)
- Dir["*/*"].each do |d|
- Dir.chdir(d) do
- Dir["*/*.log"].each do |subdir_file|
- name = File.basename(subdir_file, ".log")
- file = "#{name}.log"
- if ! log[name] || ! FileUtils.uptodate?(file, [subdir_file])
- FileUtils.cp(subdir_file, file)
- FileUtils.cp("#{subdir_file}.html", "#{file}.html")
- log[name] = true
+ def self.ci_mux_log_hosts(status, final_status)
+ log = {}
+ Dir.chdir("#{Rbpkg.ci_dir}/log") do
+ Dir["*/*"].each do |d|
+ Dir.chdir(d) do
+ Dir["*/*.log"].each do |subdir_file|
+ name = File.basename(subdir_file, ".log")
+ d_name = "#{d}/#{name}"
+ file = "#{name}.log"
+ if ! File.exist?(file) || File.mtime(file) <= File.mtime(subdir_file)
+ FileUtils.cp(subdir_file, file)
+ subdir_file_html = "#{subdir_file}.html"
+ FileUtils.cp(subdir_file_html, "#{file}.html")
+ log_item = {log: subdir_file,
+ html: subdir_file_html,
+ status: status[name][d_name]}
+ if ! log[name]
+ log[name] = {}
+ end
+ log[name][d_name] = log_item
+ end
end
end
end
end
end
- def self.ci_mux_host_status(status)
+ def self.ci_mux_status(status)
+ final_status = {}
+ Dir.chdir("#{ci_dir}/status") do
+ status.each do |name, s|
+ sh_name = sh_quote(name)
+ final_status[name] = if s.find(:running)
+ :running
+ elsif s.find(:ko)
+ :ko
+ else
+ :ok
+ end
+ File.write("#{name}.status", final_status[name])
+ end
+ end
+ final_status
+ end
+
+ def self.ci_mux_status_hosts
+ status = {}
Dir.chdir("#{ci_dir}/status") do
Dir["*/*"].each do |d|
Dir.chdir(d) do
Dir["*/*.status"].each do |subdir_file|
+ s = File.read(subdir_file).strip.to_sym
+ raise "invalid status" unless [:running, :ko, :ok].include?(s)
name = File.basename(subdir_file, ".status")
puts "status[#{name.inspect}]"
+ d_name = "#{d}/#{name}"
file = "#{name}.status"
- if ! FileUtils.uptodate?(file, [subdir_file])
+ if ! File.exist(file) || File.mtime(file) <= File.mtime(subdir_file)
cmd! "cp -a #{sh_quote(subdir_file)} #{sh_quote(file)}"
- status[name] = true
+ if ! status[name]
+ status[name] = {}
+ end
+ status[name][d_name] = s
end
end
end
end
end
- end
-
- def self.ci_mux_status(status)
- Dir.chdir("#{ci_dir}/status") do
- status.each do |name, s|
- sh_name = sh_quote(name)
- s = if system("grep -q running */*/#{sh_name}.status")
- "running\n"
- elsif system("grep -q ko */*/#{sh_name}.status")
- "ko\n"
- else
- "ok\n"
- end
- File.write("#{name}.status", s)
- end
- end
+ status
end
def self.ci_remote(repo, branch, commit, host)