aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorPeter Wilmott <p@p8952.info>2015-04-12 15:34:51 +0100
committerPeter Wilmott <p@p8952.info>2015-04-12 15:34:51 +0100
commit7e41d12fbeaaa6d62b926e9a53e0f720eceaa5e6 (patch)
tree5b84987e73f4ec99da42f5b01c5fedfd78c0ee6f /web
parentMerge pull request #15 from p8952/package_search (diff)
downloadruby-tinderbox-7e41d12fbeaaa6d62b926e9a53e0f720eceaa5e6.tar.gz
ruby-tinderbox-7e41d12fbeaaa6d62b926e9a53e0f720eceaa5e6.tar.bz2
ruby-tinderbox-7e41d12fbeaaa6d62b926e9a53e0f720eceaa5e6.zip
When building a package also build it with the next target if possible
Diffstat (limited to 'web')
-rw-r--r--web/Rakefile27
-rw-r--r--web/app.rb1
-rw-r--r--web/lib/ci.rb119
-rw-r--r--web/lib/packages.rb10
-rw-r--r--web/lib/repoman.rb92
-rw-r--r--web/views/layout.erb6
6 files changed, 127 insertions, 128 deletions
diff --git a/web/Rakefile b/web/Rakefile
index 27525e0..e2d5b44 100644
--- a/web/Rakefile
+++ b/web/Rakefile
@@ -20,14 +20,19 @@ namespace :db do
update_packages
end
+ desc 'Clear the packages database'
+ task :clear_packages do
+ clear_build
+ end
+
desc 'Update the build database with logfiles from ci-logs/'
- task :update_ci do
- update_ci
+ task :update_build do
+ update_build
end
desc 'Clear the build database'
- task :clear_ci do
- clear_ci
+ task :clear_build do
+ clear_build
end
desc 'Update the repoman database with logfiles from repo-logs/'
@@ -65,24 +70,28 @@ namespace :docker do
@volume_container.start
@volume_container.wait(36_000)
- docker_path = File.dirname(File.expand_path(File.dirname(__FILE__)))
- @ci_image = Docker::Image.build_from_dir(docker_path)
+ if ENV['CI_IMAGE'].nil?
+ docker_path = File.dirname(File.expand_path(File.dirname(__FILE__)))
+ @ci_image = Docker::Image.build_from_dir(docker_path)
+ else
+ @ci_image = Docker::Image.get(ENV['CI_IMAGE'])
+ end
end
desc 'Remove a previously built docker image'
task :teardown do
- @ci_image.delete
+ @ci_image.delete if ENV['CI_IMAGE'].nil?
@volume_container.delete(v: 1)
@volume_image.delete
end
desc 'Build test packages ( NUM_OF_PACKAGES={5,all,untested} )'
task :run_build do
- run_ci(@volume_container, @ci_image, num_of_packages)
+ run_ci(@volume_container, @ci_image, 'build', num_of_packages)
end
desc 'QA test packages ( NUM_OF_PACKAGES={5,all} )'
task :run_repoman do
- run_repoman(@ci_image, num_of_packages)
+ run_ci(@volume_container, @ci_image, 'repoman', num_of_packages)
end
end
diff --git a/web/app.rb b/web/app.rb
index 661d0dd..1aa3ce8 100644
--- a/web/app.rb
+++ b/web/app.rb
@@ -12,7 +12,6 @@ require_relative 'lib/ci'
require_relative 'lib/helpers'
require_relative 'lib/models'
require_relative 'lib/packages'
-require_relative 'lib/repoman'
class RubyTinderbox < Sinatra::Base
get '/' do
diff --git a/web/lib/ci.rb b/web/lib/ci.rb
index 13e7ac0..bbe0b23 100644
--- a/web/lib/ci.rb
+++ b/web/lib/ci.rb
@@ -1,4 +1,39 @@
-def run_ci(volume_container, ci_image, num_of_packages)
+def run_ci(volume_container, ci_image, ci_type, num_of_packages)
+ packages = generate_package_list(ci_type, num_of_packages)
+
+ packages.peach(8) do |package|
+ package = package.split(' ')
+ identifier = package[0]
+ current_target = package[1]
+ next_target = package[2]
+
+ if ci_type == 'build'
+ cmd = %W[/ruby-tinderbox/tinder.sh #{identifier} #{current_target} #{next_target}]
+ elsif ci_type == 'repoman'
+ cmd = %W[/ruby-tinderbox/repoman.sh #{identifier} #{current_target} #{next_target}]
+ end
+ ci_container = Docker::Container.create(
+ Cmd: cmd,
+ Image: ci_image.id
+ )
+ ci_container.start(VolumesFrom: volume_container.id)
+ ci_container.wait(36_000)
+
+ tar = Tempfile.new('tar')
+ File.open(tar, 'w') do |file|
+ ci_container.copy('/ruby-tinderbox/ci-logs') do |chunk|
+ file.write(chunk)
+ end
+ end
+ Archive::Tar::Minitar.unpack(tar, File.dirname(File.expand_path(File.dirname(__FILE__))))
+ tar.close
+ tar.unlink
+
+ ci_container.delete
+ end
+end
+
+def generate_package_list(ci_type, num_of_packages)
packages = []
Package.each do |package|
packages << package[:identifier]
@@ -6,7 +41,9 @@ def run_ci(volume_container, ci_image, num_of_packages)
if num_of_packages == 'all'
packages = packages
- elsif num_of_packages == 'untested'
+ elsif num_of_packages == 'untested' and ci_type == 'repoman'
+ packages = packages
+ elsif num_of_packages == 'untested' and ci_type == 'build'
packages = []
Package.each do |package|
next if package.build.count > 0
@@ -30,33 +67,33 @@ def run_ci(volume_container, ci_image, num_of_packages)
packages = packages.sample(num_of_packages)
else
puts 'ERROR: Invalid value for NUM_OF_PACKAGES'
+ puts ci_type
+ puts num_of_packages
exit
end
- packages = packages.uniq
- packages.each do |package|
- ci_container = Docker::Container.create(
- Cmd: %W[/ruby-tinderbox/tinder.sh #{package}],
- Image: ci_image.id
- )
- ci_container.start(VolumesFrom: volume_container.id)
- ci_container.wait(36_000)
+ packages_with_targets = []
+ packages.uniq.each do |package|
+ package = Package.where(identifier: package).first
- tar = Tempfile.new('tar')
- File.open(tar, 'w') do |file|
- ci_container.copy('/ruby-tinderbox/ci-logs') do |chunk|
- file.write(chunk)
- end
- end
- Archive::Tar::Minitar.unpack(tar, File.dirname(File.expand_path(File.dirname(__FILE__))))
- tar.close
- tar.unlink
+ target = 'unknown'
+ target = package[:r19_target] unless package[:r19_target] == 'nil'
+ target = package[:r20_target] unless package[:r20_target] == 'nil'
+ target = package[:r21_target] unless package[:r21_target] == 'nil'
+ target = package[:r22_target] unless package[:r22_target] == 'nil'
- ci_container.delete
+ next_target = 'unknown'
+ next_target = 'ruby20' if target == 'ruby19'
+ next_target = 'ruby21' if target == 'ruby20'
+ next_target = 'ruby22' if target == 'ruby21'
+
+ packages_with_targets << "#{package[:identifier]} #{target} #{next_target}"
end
+
+ packages_with_targets
end
-def update_ci
+def update_build
Dir.glob('ci-logs/*/*/builds/*') do |build|
begin
build_array = build.split('/')
@@ -91,6 +128,44 @@ def update_ci
end
end
-def clear_ci
+def update_repoman
+ Dir.glob('ci-logs/*/*/repomans/*') do |repoman|
+ begin
+ repoman_array = repoman.split('/')
+ sha1 = repoman_array[1]
+ timestamp = repoman_array[4]
+ target = repoman_array[2].sub('_target', '')
+
+ log = File.read("#{repoman}/repoman_log")
+
+ result = 'unknown'
+ if log.include?('If everyone were like you, I\'d be out of business!')
+ result = 'passed'
+ elsif log.include?('You\'re only giving me a partial QA payment?')
+ result = 'partial'
+ elsif log.include?('Make your QA payment on time and you\'ll never see the likes of me.')
+ result = 'failed'
+ end
+
+ Package.where(sha1: sha1).first.add_repoman(
+ Repoman.find_or_create(
+ timestamp: timestamp,
+ target: target,
+ result: result,
+ log: log
+ )
+ )
+ rescue => e
+ puts "ERROR: #{e}"
+ next
+ end
+ end
+end
+
+def clear_build
Build.map(&:delete)
end
+
+def clear_repoman
+ Repoman.map(&:delete)
+end
diff --git a/web/lib/packages.rb b/web/lib/packages.rb
index eb62883..1d4b7ea 100644
--- a/web/lib/packages.rb
+++ b/web/lib/packages.rb
@@ -1,5 +1,5 @@
def update_packages
- packages_txt = `python3 lib/packages.py`
+ packages_txt = `python3 lib/packages.py`.uniq
packages_txt.lines.peach do |line|
category, name, version, revision, slot, amd64_keyword, r19_target, r20_target, r21_target, r22_target = line.split(' ')
identifier = category + '/' + name + '-' + version + (revision == 'r0' ? '' : "-#{revision}")
@@ -39,3 +39,11 @@ def update_packages
Package.dataset.update(update_timestamp: update_timestamp)
Package.dataset.update(portage_timestamp: portage_timestamp)
end
+
+def clear_packages
+ Package.each do |package|
+ package.build.map(&:delete)
+ package.repoman.map(&:delete)
+ package.delete
+ end
+end
diff --git a/web/lib/repoman.rb b/web/lib/repoman.rb
deleted file mode 100644
index 1a44177..0000000
--- a/web/lib/repoman.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-def run_repoman(ci_image, num_of_packages)
- packages = []
- Package.each do |package|
- target = ''
- target = package[:r19_target] unless package[:r19_target] == 'nil'
- target = package[:r20_target] unless package[:r20_target] == 'nil'
- target = package[:r21_target] unless package[:r21_target] == 'nil'
- target = package[:r22_target] unless package[:r22_target] == 'nil'
- next if target.empty?
-
- next_target = ''
- next_target = 'ruby20' if target == 'ruby19'
- next_target = 'ruby21' if target == 'ruby20'
- next_target = 'ruby22' if target == 'ruby21'
- next if next_target.empty?
-
- packages << "#{package[:identifier]} #{target} #{next_target}"
- end
-
- if num_of_packages == 'all'
- packages = packages
- elsif num_of_packages.is_a?(Integer)
- packages = packages.sample(num_of_packages)
- else
- puts 'ERROR: Invalid value for NUM_OF_PACKAGES'
- exit
- end
-
- packages = packages.uniq
- packages.peach(8) do |package|
- package = package.split(' ')
- identifier = package[0]
- current_target = package[1]
- next_target = package[2]
- ci_container = Docker::Container.create(
- Cmd: %W[/ruby-tinderbox/repoman.sh #{identifier} #{current_target} #{next_target}],
- Image: ci_image.id
- )
- ci_container.start
- ci_container.wait(36_000)
-
- tar = Tempfile.new('tar')
- File.open(tar, 'w') do |file|
- ci_container.copy('/ruby-tinderbox/ci-logs') do |chunk|
- file.write(chunk)
- end
- end
- Archive::Tar::Minitar.unpack(tar, File.dirname(File.expand_path(File.dirname(__FILE__))))
- tar.close
- tar.unlink
-
- ci_container.delete
- end
-end
-
-def update_repoman
- Dir.glob('ci-logs/*/*/repomans/*') do |repoman|
- begin
- repoman_array = repoman.split('/')
- sha1 = repoman_array[1]
- timestamp = repoman_array[4]
- target = repoman_array[2].sub('_target', '')
-
- log = File.read("#{repoman}/repoman_log")
-
- result = 'unknown'
- if log.include?('If everyone were like you, I\'d be out of business!')
- result = 'passed'
- elsif log.include?('You\'re only giving me a partial QA payment?')
- result = 'partial'
- elsif log.include?('Make your QA payment on time and you\'ll never see the likes of me.')
- result = 'failed'
- end
-
- Package.where(sha1: sha1).first.add_repoman(
- Repoman.find_or_create(
- timestamp: timestamp,
- target: target,
- result: result,
- log: log
- )
- )
- rescue => e
- puts "ERROR: #{e}"
- next
- end
- end
-end
-
-def clear_repoman
- Repoman.map(&:delete)
-end
diff --git a/web/views/layout.erb b/web/views/layout.erb
index 9d564b3..0e961a8 100644
--- a/web/views/layout.erb
+++ b/web/views/layout.erb
@@ -5,9 +5,9 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Ruby Tinderbox provides information and statistics on the state of Ruby related packages in Gentoo Linux.">
-<link rel="stylesheet" href="/css/style.css">
-<link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.css" rel="stylesheet" media="screen">
-<link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/tyrian.min.css" rel="stylesheet" media="screen">
+<link href="/css/style.css" rel="stylesheet">
+<link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.css" rel="stylesheet">
+<link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/tyrian.min.css" rel="stylesheet">
<script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/jquery.min.js"></script>
<script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.js"></script>
<script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/retina.min.js"></script>