diff options
author | 2015-08-24 18:20:16 +0100 | |
---|---|---|
committer | 2015-08-24 18:20:16 +0100 | |
commit | 44b93dff35ea11aadfa39302174a15ddd193fea9 (patch) | |
tree | a031e6e3e2ae7d38d40e54c1da4741e3f758c396 | |
parent | Only list succeeded and passed packages on the new targets page (diff) | |
download | ruby-tinderbox-44b93dff35ea11aadfa39302174a15ddd193fea9.tar.gz ruby-tinderbox-44b93dff35ea11aadfa39302174a15ddd193fea9.tar.bz2 ruby-tinderbox-44b93dff35ea11aadfa39302174a15ddd193fea9.zip |
Merge current and next targets into a single db entry
26 files changed, 132 insertions, 65 deletions
diff --git a/bin/repoman.sh b/bin/repoman.sh index f76d514..5fe0101 100755 --- a/bin/repoman.sh +++ b/bin/repoman.sh @@ -22,7 +22,7 @@ function REPOMAN() { repoman manifest repoman full > /tmp/repoman_log_current || true - if [[ "$NEXT_TARGET" != 'unknown' ]]; then + if [[ "$NEXT_TARGET" != 'nil' ]]; then sed -i -e "/^USE_RUBY/s/=\"/=\"$NEXT_TARGET /" "$NAME-$VERSION.ebuild" repoman manifest repoman full > /tmp/repoman_log_next || true @@ -32,15 +32,14 @@ function REPOMAN() { } function LOG() { - DATE=$(date +%s) SHA1=$(sha1sum "/usr/portage/$CATEGORY/$NAME/$NAME-$VERSION.ebuild" | awk '{print $1}') - mkdir -p "$SCRIPT_DIR/ci-logs/$SHA1/current_target/repomans/$DATE" - cp /tmp/repoman_log_current "$SCRIPT_DIR/ci-logs/$SHA1/current_target/repomans/$DATE/repoman_log" + mkdir -p "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/repomans/current" + cp /tmp/repoman_log_current "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/repomans/current/repoman_log" - if [[ "$NEXT_TARGET" != 'unknown' ]]; then - mkdir -p "$SCRIPT_DIR/ci-logs/$SHA1/next_target/repomans/$DATE" - cp /tmp/repoman_log_next "$SCRIPT_DIR/ci-logs/$SHA1/next_target/repomans/$DATE/repoman_log" + if [[ "$NEXT_TARGET" != 'nil' ]]; then + mkdir -p "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/repomans/next_target" + cp /tmp/repoman_log_next "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/repomans/next_target/repoman_log" fi chmod 755 -R "$SCRIPT_DIR/ci-logs" @@ -54,6 +53,7 @@ function CLEANUP() { ENV_SETUP +DATE=$(date +%s) PKG_ARR=($(qatom "$1")) CATEGORY="${PKG_ARR[0]}" NAME="${PKG_ARR[1]}" diff --git a/bin/tinder.sh b/bin/tinder.sh index 6e78e54..47dd93e 100755 --- a/bin/tinder.sh +++ b/bin/tinder.sh @@ -58,31 +58,30 @@ function EMERGE() { } function LOG() { - DATE=$(date +%s) SHA1=$(sha1sum "/usr/portage/$CATEGORY/$NAME/$NAME-$VERSION.ebuild" | awk '{print $1}') - mkdir -p "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE" + mkdir -p "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE" - emerge --info "=$PACKAGE" > "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE/emerge-info" - emerge -pqv "=$PACKAGE" > "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE/emerge-pqv" - cp "/var/tmp/portage/$PACKAGE/temp/build.log" "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE/build.log" - cp "/var/tmp/portage/$PACKAGE/temp/environment" "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE/environment" - gem list > "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE/gem-list" + emerge --info "=$PACKAGE" > "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE/emerge-info" + emerge -pqv "=$PACKAGE" > "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE/emerge-pqv" + cp "/var/tmp/portage/$PACKAGE/temp/build.log" "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE/build.log" + cp "/var/tmp/portage/$PACKAGE/temp/environment" "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE/environment" + gem list > "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE/gem-list" if [[ $1 == 0 ]]; then RESULT="\e[0;32mBUILD SUCCEEDED\e[0m" - echo "succeeded" > "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE/result" + echo "succeeded" > "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE/result" elif [[ $1 == 1 ]]; then RESULT="\e[0;31mBUILD FAILED\e[0m" - echo "failed" > "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE/result" + echo "failed" > "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE/result" elif [[ $1 == 124 ]]; then RESULT="\e[0;31mBUILD TIMED OUT\e[0m" - echo "timed out" > "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE/result" + echo "timed out" > "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE/result" else RESULT="\e[0;31mBUILD UNKNOWN\e[0m" - echo "unknown" > "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE/result" + echo "unknown" > "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE/result" fi - chmod 755 -R "$SCRIPT_DIR/ci-logs/$SHA1/$TYPE/builds/$DATE" + chmod 755 -R "$SCRIPT_DIR/ci-logs/$SHA1/$DATE/builds/$TYPE" } function CLEANUP() { @@ -98,6 +97,7 @@ function CLEANUP() { ENV_SETUP +DATE=$(date +%s) PKG_ARR=($(qatom "$1")) CATEGORY="${PKG_ARR[0]}" NAME="${PKG_ARR[1]}" @@ -108,13 +108,13 @@ else fi if [[ $# -eq 1 ]]; then - TYPE="current_target" + TYPE="current" PACKAGE=$1 SETUP EMERGE CLEANUP elif [[ $# -eq 2 ]]; then - TYPE="current_target" + TYPE="current" PACKAGE=$1 SETUP EMERGE diff --git a/web/Rakefile b/web/Rakefile index 3c9225a..0d12d99 100644 --- a/web/Rakefile +++ b/web/Rakefile @@ -36,7 +36,7 @@ namespace :db do desc 'Update the build database with logfiles from ci-logs/' task :update_build do - update_build('ci-logs/*/*/builds/*') + update_build('ci-logs/*/*/builds') end desc 'Clear the build database' @@ -46,7 +46,7 @@ namespace :db do desc 'Update the repoman database with logfiles from repo-logs/' task :update_repoman do - update_repoman('ci-logs/*/*/repomans/*') + update_repoman('ci-logs/*/*/repomans') end desc 'Clear the repoman database' diff --git a/web/db/migrations/021_merge_build_types.rb b/web/db/migrations/021_merge_build_types.rb new file mode 100644 index 0000000..1c3cc54 --- /dev/null +++ b/web/db/migrations/021_merge_build_types.rb @@ -0,0 +1,14 @@ +Sequel.migration do + change do + drop_column :builds, :target + add_column :builds, :result_next_target, String + add_column :builds, :emerge_info_next_target, String + add_column :builds, :emerge_pqv_next_target, String + add_column :builds, :build_log_next_target, String + add_column :builds, :gem_list_next_target, String + + drop_column :repomans, :target + add_column :repomans, :result_next_target, String + add_column :repomans, :log_next_target, String + end +end diff --git a/web/lib/ci.rb b/web/lib/ci.rb index e21fad1..22fd6b0 100644 --- a/web/lib/ci.rb +++ b/web/lib/ci.rb @@ -63,7 +63,10 @@ def generate_package_list(ci_type, num_of_packages) end end elsif num_of_packages.is_a?(Integer) - packages = packages.sample(num_of_packages) + packages = [] + packages << Package.where(identifier: 'dev-ruby/color-1.7.1').first + packages << Package.where(identifier: 'dev-ruby/crack-0.4.2-r1').first + packages << Package.where(identifier: 'dev-ruby/atomic-1.1.99').first else puts 'ERROR: Invalid value for NUM_OF_PACKAGES' puts ci_type @@ -73,7 +76,6 @@ def generate_package_list(ci_type, num_of_packages) packages_with_targets = [] packages.uniq.each do |package| - package = Package.where(identifier: package).first packages_with_targets << "#{package[:identifier]} #{package[:next_target]}" end @@ -86,26 +88,35 @@ def update_build(log_path) build_array = build.split('/') build_array.shift(1) if build_array[1] == 'test-logs' sha1 = build_array[1] - timestamp = build_array[4] - target = build_array[2].sub('_target', '') + timestamp = build_array[2] + + result = File.read("#{build}/current/result").strip if File.exist?("#{build}/current/result") + emerge_info = File.read("#{build}/current/emerge-info") if File.exist?("#{build}/current/emerge-info") + emerge_pqv = File.read("#{build}/current/emerge-pqv") if File.exist?("#{build}/current/emerge-pqv") + build_log = File.read("#{build}/current/build.log") if File.exist?("#{build}/current/build.log") + gem_list = File.read("#{build}/current/gem-list") if File.exist?("#{build}/current/gem-list") - result = File.read("#{build}/result").strip - emerge_info = File.read("#{build}/emerge-info") if File.exist?("#{build}/emerge-info") - emerge_pqv = File.read("#{build}/emerge-pqv") if File.exist?("#{build}/emerge-pqv") - build_log = File.read("#{build}/build.log") if File.exist?("#{build}/build.log") - gem_list = File.read("#{build}/gem-list") if File.exist?("#{build}/gem-list") + result_next_target = File.read("#{build}/next_target/result").strip if File.exist?("#{build}/next_target/result") + emerge_info_next_target = File.read("#{build}/next_target/emerge-info") if File.exist?("#{build}/next_target/emerge-info") + emerge_pqv_next_target = File.read("#{build}/next_target/emerge-pqv") if File.exist?("#{build}/next_target/emerge-pqv") + build_log_next_target = File.read("#{build}/next_target/build.log") if File.exist?("#{build}/next_target/build.log") + gem_list_next_target = File.read("#{build}/next_target/gem-list") if File.exist?("#{build}/next_target/gem-list") package = Package.where(sha1: sha1).first unless package.nil? package.add_build( Build.find_or_create( timestamp: timestamp, - target: target, result: result, emerge_info: emerge_info, emerge_pqv: emerge_pqv, build_log: build_log, - gem_list: gem_list + gem_list: gem_list, + result_next_target: result_next_target, + emerge_info_next_target: emerge_info_next_target, + emerge_pqv_next_target: emerge_pqv_next_target, + build_log_next_target: build_log_next_target, + gem_list_next_target: gem_list_next_target ) ) end @@ -122,10 +133,10 @@ def update_repoman(log_path) repoman_array = repoman.split('/') repoman_array.shift(1) if repoman_array[1] == 'test-logs' sha1 = repoman_array[1] - timestamp = repoman_array[4] - target = repoman_array[2].sub('_target', '') + timestamp = repoman_array[2] - log = File.read("#{repoman}/repoman_log") + log = File.read("#{repoman}/current/repoman_log") if File.exist?("#{repoman}/current/repoman_log") + log_next_target = File.read("#{repoman}/next_target/repoman_log") if File.exist?("#{repoman}/next_target/repoman_log") result = 'unknown' if log.include?('If everyone were like you, I\'d be out of business!') @@ -136,14 +147,26 @@ def update_repoman(log_path) result = 'failed' end + result_next_target = 'unknown' + unless log_next_target.nil? + if log_next_target.include?('If everyone were like you, I\'d be out of business!') + result_next_target = 'passed' + elsif log_next_target.include?('You\'re only giving me a partial QA payment?') + result_next_target = 'partial' + elsif log_next_target.include?('Make your QA payment on time and you\'ll never see the likes of me.') + result_next_target = 'failed' + end + end + package = Package.where(sha1: sha1).first unless package.nil? package.add_repoman( Repoman.find_or_create( timestamp: timestamp, - target: target, result: result, - log: log + log: log, + result_next_target: result_next_target, + log_next_target: log_next_target ) ) end diff --git a/web/routes/build_status.rb b/web/routes/build_status.rb index edc0f32..9d0b57a 100644 --- a/web/routes/build_status.rb +++ b/web/routes/build_status.rb @@ -4,7 +4,7 @@ class RubyTinderbox < Sinatra::Base portage_timestamp = Package.first[:portage_timestamp] builds = [] Package.each do |package| - builds << package.build_dataset.where(target: 'current').reverse_order(:timestamp).first + builds << package.build_dataset.reverse_order(:timestamp).first end builds = builds.compact.sort_by { |build| build.package[:identifier] } erb :build_status, locals: { builds: builds, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp } @@ -12,7 +12,7 @@ class RubyTinderbox < Sinatra::Base get '/build_status/:sha1' do package = Package.where(sha1: params[:sha1]).first - builds = package.build_dataset.where(target: 'current').reverse_order(:timestamp) + builds = package.build_dataset.reverse_order(:timestamp) erb :build_status_sha1, locals: { builds: builds } end diff --git a/web/routes/repoman_checks.rb b/web/routes/repoman_checks.rb index dcb36f7..1029042 100644 --- a/web/routes/repoman_checks.rb +++ b/web/routes/repoman_checks.rb @@ -4,7 +4,7 @@ class RubyTinderbox < Sinatra::Base portage_timestamp = Package.first[:portage_timestamp] repomans = [] Package.each do |package| - repomans << package.repoman_dataset.where(target: 'current').reverse_order(:timestamp).first + repomans << package.repoman_dataset.reverse_order(:timestamp).first end repomans = repomans.compact.sort_by { |repoman| repoman.package[:identifier] } erb :repoman_checks, locals: { repomans: repomans, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp } @@ -12,7 +12,7 @@ class RubyTinderbox < Sinatra::Base get '/repoman_checks/:sha1' do package = Package.where(sha1: params[:sha1]).first - repomans = package.repoman_dataset.where(target: 'current').reverse_order(:timestamp) + repomans = package.repoman_dataset.reverse_order(:timestamp) erb :repoman_checks_sha1, locals: { repomans: repomans } end diff --git a/web/routes/tasks.rb b/web/routes/tasks.rb index 4fb48d1..b060199 100644 --- a/web/routes/tasks.rb +++ b/web/routes/tasks.rb @@ -4,19 +4,13 @@ class RubyTinderbox < Sinatra::Base portage_timestamp = Package.first[:portage_timestamp] packages = [] Package.each do |package| - build_current = package.build_dataset.where(target: 'current').reverse_order(:timestamp).first - next if build_current.nil? || build_current[:result] != 'succeeded' + build = package.build_dataset.reverse_order(:timestamp).first + next if build.nil? || build[:result] != 'succeeded' || build[:result_next_target] != 'succeeded' - build_next = package.build_dataset.where(target: 'next').reverse_order(:timestamp).first - next if build_next.nil? || build_next[:result] != 'succeeded' + repoman = package.repoman_dataset.reverse_order(:timestamp).first + next if repoman.nil? || repoman[:result] != 'passed' || repoman[:result_next_target] != 'passed' - repoman_current = package.repoman_dataset.where(target: 'current').reverse_order(:timestamp).first - next if repoman_current.nil? || repoman_current[:result] != 'passed' - - repoman_next = package.repoman_dataset.where(target: 'next').reverse_order(:timestamp).first - next if repoman_next.nil? || repoman_next[:result] != 'passed' - - packages << [package, build_current, build_next, repoman_current, repoman_next] + packages << [package, build, repoman] end packages = packages.compact.sort_by { |package| package[0][:identifier] } erb :new_targets, locals: { packages: packages, update_timestamp: update_timestamp, portage_timestamp: portage_timestamp } diff --git a/web/test/minitest_helper.rb b/web/test/minitest_helper.rb index 8618052..1925ac5 100644 --- a/web/test/minitest_helper.rb +++ b/web/test/minitest_helper.rb @@ -18,8 +18,10 @@ Package.create( r20_target: package[9], r21_target: package[10], r22_target: package[11], - gem_version: package[12] + next_target: package[12], + gem_version: package[13] ) -update_build('test/test-logs/*/*/builds/*') +update_build('test/test-logs/*/*/builds') +update_repoman('test/test-logs/*/*/repomans') -MiniTest.after_run { clear_packages } +# MiniTest.after_run { clear_packages } diff --git a/web/test/test-logs/1/current_target/builds/1355314332/build.log b/web/test/test-logs/1/1355314332/builds/current/build.log index 7b95d6b..7b95d6b 100755 --- a/web/test/test-logs/1/current_target/builds/1355314332/build.log +++ b/web/test/test-logs/1/1355314332/builds/current/build.log diff --git a/web/test/test-logs/1/current_target/builds/1355314332/emerge-info b/web/test/test-logs/1/1355314332/builds/current/emerge-info index 7b95d6b..7b95d6b 100755 --- a/web/test/test-logs/1/current_target/builds/1355314332/emerge-info +++ b/web/test/test-logs/1/1355314332/builds/current/emerge-info diff --git a/web/test/test-logs/1/current_target/builds/1355314332/emerge-pqv b/web/test/test-logs/1/1355314332/builds/current/emerge-pqv index 7b95d6b..7b95d6b 100755 --- a/web/test/test-logs/1/current_target/builds/1355314332/emerge-pqv +++ b/web/test/test-logs/1/1355314332/builds/current/emerge-pqv diff --git a/web/test/test-logs/1/current_target/builds/1355314332/gem-list b/web/test/test-logs/1/1355314332/builds/current/gem-list index 7b95d6b..7b95d6b 100755 --- a/web/test/test-logs/1/current_target/builds/1355314332/gem-list +++ b/web/test/test-logs/1/1355314332/builds/current/gem-list diff --git a/web/test/test-logs/1/current_target/builds/1355314332/result b/web/test/test-logs/1/1355314332/builds/current/result index 774a5c0..774a5c0 100755 --- a/web/test/test-logs/1/current_target/builds/1355314332/result +++ b/web/test/test-logs/1/1355314332/builds/current/result diff --git a/web/test/test-logs/1/1355314332/builds/next_target/build.log b/web/test/test-logs/1/1355314332/builds/next_target/build.log new file mode 100755 index 0000000..7b95d6b --- /dev/null +++ b/web/test/test-logs/1/1355314332/builds/next_target/build.log @@ -0,0 +1,6 @@ +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor +incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis +nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu +fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum. diff --git a/web/test/test-logs/1/1355314332/builds/next_target/emerge-info b/web/test/test-logs/1/1355314332/builds/next_target/emerge-info new file mode 100755 index 0000000..7b95d6b --- /dev/null +++ b/web/test/test-logs/1/1355314332/builds/next_target/emerge-info @@ -0,0 +1,6 @@ +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor +incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis +nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu +fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum. diff --git a/web/test/test-logs/1/1355314332/builds/next_target/emerge-pqv b/web/test/test-logs/1/1355314332/builds/next_target/emerge-pqv new file mode 100755 index 0000000..7b95d6b --- /dev/null +++ b/web/test/test-logs/1/1355314332/builds/next_target/emerge-pqv @@ -0,0 +1,6 @@ +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor +incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis +nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu +fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum. diff --git a/web/test/test-logs/1/1355314332/builds/next_target/gem-list b/web/test/test-logs/1/1355314332/builds/next_target/gem-list new file mode 100755 index 0000000..7b95d6b --- /dev/null +++ b/web/test/test-logs/1/1355314332/builds/next_target/gem-list @@ -0,0 +1,6 @@ +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor +incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis +nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu +fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum. diff --git a/web/test/test-logs/1/1355314332/builds/next_target/result b/web/test/test-logs/1/1355314332/builds/next_target/result new file mode 100755 index 0000000..774a5c0 --- /dev/null +++ b/web/test/test-logs/1/1355314332/builds/next_target/result @@ -0,0 +1 @@ +succeeded diff --git a/web/test/test-logs/1/current_target/repomans/1355314332/repoman_log b/web/test/test-logs/1/1355314332/repomans/current/repoman_log index e4630e4..e4630e4 100755 --- a/web/test/test-logs/1/current_target/repomans/1355314332/repoman_log +++ b/web/test/test-logs/1/1355314332/repomans/current/repoman_log diff --git a/web/test/test-logs/1/1355314332/repomans/next_target/repoman_log b/web/test/test-logs/1/1355314332/repomans/next_target/repoman_log new file mode 100755 index 0000000..e4630e4 --- /dev/null +++ b/web/test/test-logs/1/1355314332/repomans/next_target/repoman_log @@ -0,0 +1,8 @@ +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor +incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis +nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu +fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum. + +If everyone were like you, I'd be out of business! diff --git a/web/test/test-logs/1/package b/web/test/test-logs/1/package index 1c29f6f..de8085f 100644 --- a/web/test/test-logs/1/package +++ b/web/test/test-logs/1/package @@ -9,5 +9,6 @@ amd64 ruby19 ruby20 ruby21 +nil ruby22 1.2.4 diff --git a/web/test/test_ruby_targets.rb b/web/test/test_ruby_targets.rb index 9cd76b2..d512f95 100644 --- a/web/test/test_ruby_targets.rb +++ b/web/test/test_ruby_targets.rb @@ -27,6 +27,6 @@ class TestWeb < Minitest::Test assert last_response.body.include? 'ruby19' assert last_response.body.include? 'ruby20' assert last_response.body.include? 'ruby21' - assert last_response.body.include? 'ruby22' + assert last_response.body.include? 'nil' end end diff --git a/web/views/build_status.erb b/web/views/build_status.erb index ede45cc..2825897 100644 --- a/web/views/build_status.erb +++ b/web/views/build_status.erb @@ -38,7 +38,7 @@ <a href="/build_status/<%=build.package[:sha1]%>/<%=build[:timestamp]%>"><%=build[:result].camelcase%></a> </td> <td class="width-17"> - <a href="/build_status/<%=build.package[:sha1]%>"><%=build.package.build_dataset.where(target: 'current').count%> Build(s)</a> + <a href="/build_status/<%=build.package[:sha1]%>"><%=build.package.build_dataset.count%> Build(s)</a> </td> <td style="display:none;"> +<%=build.package[:amd64_keyword]%> diff --git a/web/views/new_targets.erb b/web/views/new_targets.erb index c2084dc..a92630b 100644 --- a/web/views/new_targets.erb +++ b/web/views/new_targets.erb @@ -34,14 +34,14 @@ <td class="width-12 <%=package[1][:result]%>"> <%=package[1][:result].camelcase%> </td> + <td class="width-12 <%=package[1][:result_next_target]%>"> + <%=package[1][:result_next_target].camelcase%> + </td> <td class="width-12 <%=package[2][:result]%>"> <%=package[2][:result].camelcase%> </td> - <td class="width-12 <%=package[3][:result]%>"> - <%=package[3][:result].camelcase%> - </td> - <td class="width-12 <%=package[4][:result]%>"> - <%=package[4][:result].camelcase%> + <td class="width-12 <%=package[2][:result_next_target]%>"> + <%=package[2][:result_next_target].camelcase%> </td> <td style="display:none;"> +<%=package[0][:amd64_keyword]%> diff --git a/web/views/repoman_checks.erb b/web/views/repoman_checks.erb index ca7751f..b8a4bcf 100644 --- a/web/views/repoman_checks.erb +++ b/web/views/repoman_checks.erb @@ -38,7 +38,7 @@ <a href="/repoman_checks/<%=repoman.package[:sha1]%>/<%=repoman[:timestamp]%>"><%=repoman[:result].camelcase%></a> </td> <td class="width-17"> - <a href="/repoman_checks/<%=repoman.package[:sha1]%>"><%=repoman.package.repoman_dataset.where(target: 'current').count%> Check(s)</a> + <a href="/repoman_checks/<%=repoman.package[:sha1]%>"><%=repoman.package.repoman_dataset.count%> Check(s)</a> </td> <td style="display:none;"> +<%=repoman.package[:amd64_keyword]%> |