ndr_dev_support 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e439e4102d508d6ab419ee40e7049cb9efe2cdd27df8a2fc1a56d33df69349d
-  data.tar.gz: 4741d243fd50eb468fd85007c8e28e07993e532121dc27f3c71d327e978c173a
+  metadata.gz: b33b208c31e16b68d55cbbc40f482d5e1d6146ef2190999b9481670706851535
+  data.tar.gz: 3cdc280a9023b1e326680f86e753d67e1124ce185046cc9fefb590b0cd5a9a34
 SHA512:
-  metadata.gz: cd21a19c5b61e79fa5936b781aa252b4ae5ffeeb89920885f10d51d17926d7f0a2018a5f0dfdf52e6ada04cf54240630a59b1a1e73b2b5907f06d2db2e603729
-  data.tar.gz: 35a0dead05c81a1e0710a00a3c3e6d720e4fe3e3ce7feb88050faa48a4dafeab55c91ce09ce7a4726f10e0ddb431746e2b4943909e63eb13e6ba4324d41ef91f
+  metadata.gz: f453af8d2db1f63f3cf9fe95141ba4943b80394a4769f76f194864168d1d20c7499d22f8ee5a5e74ada6cd2261bb95f1cde31b9e99dd1c47046d29fd48b6a06f
+  data.tar.gz: 2470eac3017806dd8ad4707044ffb67e133df973414d729a374525ca3b6e36226ced375335ac4f1c0e1ccf0d74a247f692130c7c532607b526ad31884bf9f46a

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.1.0 / 2019-01-31
+### Added
+* CI: send a slack message whenever tests pass
+* CI: send a slack message if Redmine update fails
+
+### Fixed
+* prevent `commit_metadata_persistable` from wiping prior result immediately
+* fix issue with multiple prometheus clients erasing each others' pushes
+* CI: improve git cleanup to aid auto-recovery after failure
+
 ## 5.0.1 / 2019-01-31
 ### Fixed
 * fix CI issue when Rails isn't fully loaded.

data/code_safety.yml

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 8166958d634cc01379fd8a34278c231ad37b061b
+    safe_revision: 21bcc26b9d466ccd9283dcb170fbee9138b7bfee
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -55,7 +55,7 @@ file safety:
   lib/minitest/rake_ci_plugin.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 3cadf2dc33034cfe7258f6cf4b199d3101b2a7ba
+    safe_revision: 9023b4def89e618d3f22333e9fbabd6a816873bf
   lib/ndr_dev_support.rb:
     comments: 
     reviewed_by: timgentry
@@ -95,7 +95,7 @@ file safety:
   lib/ndr_dev_support/daemon/ci_server.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: fe8682a3300a322c5f6b9a17dce471f11fa5e307
+    safe_revision: 5075331fb3f33cd214c2ca76b199f27ddd743170
   lib/ndr_dev_support/daemon/stoppable.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -159,7 +159,7 @@ file safety:
   lib/ndr_dev_support/rake_ci/concerns/commit_metadata_persistable.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 49caa4ef8ad9926843354d36f4610d40603ec632
+    safe_revision: d3347202d1efafc419c1d79d2643f3fdfcbfdd65
   lib/ndr_dev_support/rake_ci/redmine/ticket_resolver.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -195,7 +195,7 @@ file safety:
   lib/ndr_dev_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 8166958d634cc01379fd8a34278c231ad37b061b
+    safe_revision: 21bcc26b9d466ccd9283dcb170fbee9138b7bfee
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
@@ -236,11 +236,11 @@ file safety:
   lib/tasks/ci/prometheus.rake:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: fe8682a3300a322c5f6b9a17dce471f11fa5e307
+    safe_revision: 2d1b9d19acafebe6ca5f995bf15243abe2847eec
   lib/tasks/ci/redmine.rake:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: ba171e9460b57d2d9932f6c0c0bdc3a5b282af80
+    safe_revision: 2d1b9d19acafebe6ca5f995bf15243abe2847eec
   lib/tasks/ci/rugged.rake:
     comments: 
     reviewed_by: timgentry

data/lib/minitest/rake_ci_plugin.rb

@@ -76,7 +76,7 @@ module Minitest
       @current_attachments = []
       @current_attachments << failures_attachment if failures.positive?
       @current_attachments << errors_attachment if errors.positive?
-      @current_attachments << pass_attachment if newly_passing?
+      @current_attachments << pass_attachment if passing?
       @current_attachments
     end
 
@@ -99,13 +99,17 @@ module Minitest
     def pass_attachment
       {
         color: 'good',
-        text: 'Tests now pass',
+        text: newly_passing? ? 'Tests now pass! :tada:' : 'Tests passed',
         footer: 'bundle exec rake ci:minitest'
       }
     end
 
+    def passing?
+      !(failures.positive? || errors.positive?)
+    end
+
     def newly_passing?
-      return false if failures.positive? || errors.positive?
+      return false unless passing?
 
       last_commit_hash = load_last_commit_data
       return false if last_commit_hash.nil?

data/lib/ndr_dev_support/daemon/ci_server.rb

@@ -47,17 +47,18 @@ module NdrDevSupport
         log('running once...')
 
         git_fetch
+        git_discard_changes
         git_checkout(MASTER_BRANCH_NAME)
 
         objectids_between_master_and_remote.each do |oid|
           log("testing #{oid}...")
+          git_discard_changes
           git_rebase(oid)
 
           WithCleanRbenv.with_clean_rbenv do
             # TODO: rbenv_install
             bundle_install
             system('rbenv exec bundle exec rake ci:all --trace')
-            git_discard_changes
           end
         end
 

data/lib/ndr_dev_support/rake_ci/concerns/commit_metadata_persistable.rb

@@ -13,30 +13,29 @@ module CommitMetadataPersistable
   private
 
   def load_last_commit_data
-    hash = YAML.load_file(filename)
-
-    if commit.parents.map(&:oid).include?(hash[:commit])
-      # payload from parent commit
-      hash[:payload]
-    end
-  rescue Errno::ENOENT
-    nil
+    load_hash_matching(*commit.parents.map(&:oid))[:payload]
   end
 
   def load_current_commit_data
-    hash = YAML.load_file(filename)
+    load_hash_matching(commit.oid)[:payload]
+  end
 
-    if commit.oid == hash[:commit]
-      # payload from parent commit
-      hash[:payload]
-    end
+  def load_hash_matching(*commits)
+    match = Array.wrap(YAML.load_file(filename)).
+            detect { |h| commits.include? h[:commit] }
+
+    match || {}
   rescue Errno::ENOENT
-    nil
+    {}
   end
 
   def save_current_commit_data(data)
-    hash = { commit: commit.oid, payload: data }
-    File.write(filename, YAML.dump(hash))
+    hashes = [
+      load_hash_matching(*commit.parents.map(&:oid)),
+      { commit: commit.oid, payload: data }
+    ].reject(&:blank?)
+
+    File.write(filename, YAML.dump(hashes))
   end
 
   def filename

data/lib/ndr_dev_support/version.rb

@@ -2,5 +2,5 @@
 # This defines the NdrDevSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks (and our own).
 module NdrDevSupport
-  VERSION = '5.0.1'.freeze
+  VERSION = '5.1.0'.freeze
 end

data/lib/tasks/ci/prometheus.rake

@@ -14,7 +14,10 @@ namespace :ci do
 
     desc 'Push Prometheus stats'
     task publish: :setup do
-      next if @metrics.empty? || ENV['PROMETHEUS_PUSHGATEWAY'].nil?
+      gateway = ENV['PROMETHEUS_PUSHGATEWAY']
+      project = ENV['PROMETHEUS_PROJECTNAME']
+
+      next if @metrics.empty? || gateway.nil?
 
       require 'prometheus/client'
       require 'prometheus/client/push'
@@ -35,7 +38,7 @@ namespace :ci do
             if prometheus.exist?(name)
               prometheus.get(name)
             else
-              prometheus.gauge(name, docstring, project: ENV['PROMETHEUS_PROJECTNAME'])
+              prometheus.gauge(name, docstring, project: project)
             end
           gauge.set(label_set, value)
         else
@@ -43,7 +46,7 @@ namespace :ci do
         end
       end
 
-      client = Prometheus::Client::Push.new('rake-ci-job', nil, ENV['PROMETHEUS_PUSHGATEWAY'])
+      client = Prometheus::Client::Push.new("rake-ci-#{project}", nil, gateway)
 
       begin
         client.add(prometheus)
@@ -55,8 +58,7 @@ namespace :ci do
           color: 'danger',
           title: 'Publishing Error',
           text: 'Build metrics could not be pushed - the Prometheus gateway was uncontactable',
-          footer: 'bundle exec rake ci:prometheus:publish',
-          mrkdwn_in: ['text']
+          footer: 'bundle exec rake ci:prometheus:publish'
         }
       end
     end

data/lib/tasks/ci/redmine.rake

@@ -17,12 +17,24 @@ namespace :ci do
       hostname = ENV['REDMINE_HOSTNAME']
       next if api_key.nil? || hostname.nil?
 
+      resolved_tickets = []
+      @attachments   ||= []
+
       require 'ndr_dev_support/rake_ci/redmine/ticket_resolver'
 
-      ticket_resolver = NdrDevSupport::RakeCI::Redmine::TicketResolver.new(api_key, hostname)
-      resolved_tickets = ticket_resolver.process_commit(@commit.author[:name],
-                                                        @friendly_revision_name,
-                                                        @commit.message)
+      begin
+        ticket_resolver = NdrDevSupport::RakeCI::Redmine::TicketResolver.new(api_key, hostname)
+        resolved_tickets = ticket_resolver.process_commit(@commit.author[:name],
+                                                          @friendly_revision_name,
+                                                          @commit.message)
+      rescue
+        @attachments << {
+          color: 'danger',
+          title: 'Redmine Update Error',
+          text: 'Ticket(s) could not be resolved on Redmine!',
+          footer: 'bundle exec rake ci:redmine:update_tickets'
+        }
+      end
 
       next if resolved_tickets.empty?
       resolved_tickets.map! { |ticket_id| "https://#{hostname}/issues/#{ticket_id}" }
@@ -36,7 +48,6 @@ namespace :ci do
         footer: 'bundle exec rake ci:minitest',
         mrkdwn_in: ['text']
       }
-      @attachments ||= []
       @attachments << attachment
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - NCRS Development Team