bcnd 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd1231c53748e4824cf3cb6d1c777ad46987de57
-  data.tar.gz: 26ed271be9ea4f20584b22f67c0d218b9d32fa1b
+  metadata.gz: 6230e004285ab6eb7a389e3e0fa061a078b13dc3
+  data.tar.gz: faf24aa4833ee588080813e2a7c1be72f5c424fb
 SHA512:
-  metadata.gz: 9fa2ef4177135bec02968a9d19d15ae797e1d8d16aea1c5ef46fa8575adba9d123e1a16b2d54f39126e60b256df97dcaa042721b99751852ce978995aeadec02
-  data.tar.gz: 7ce1ef08ebe56b2640366cbfe3d49e63b1cc39f263e34c09938085bda2aeef8a553d5a4a4541657597f8f0ee143402a4e3f3101b092a76ae64c33324f7c3e3f1
+  metadata.gz: b2b94d49b67fe14200cdae999313b721439ab27d1ed984dadbb381314a6502803531697ce775958b6fc1b98a2af9f7747ba4d0e307d61185a618445cbbffcb2d
+  data.tar.gz: b1782499cd34cfab166565e387f2f1ea29e96e43de9f107fb59370937cadcf9081784416f41f424a9f853b3c8b9e8b0078bdc5bdeffcb4bd16ead5ef27b6385b

data/lib/bcnd/quay_io.rb

@@ -93,10 +93,8 @@ module Bcnd
           "specificTag" => tag
         }
       )
-      tags = resp["tags"]
-      tags.find { |tag|
-        tag["end_ts"].nil?
-      }["docker_image_id"]
+      tag = resp["tags"].find { |tag| tag["end_ts"].nil? }
+      tag.nil? ? nil : tag["docker_image_id"]
     end
 
     def put_tag(repo:, image_id:, tag:)

data/lib/bcnd/runner.rb

@@ -23,10 +23,18 @@ module Bcnd
     private
 
     def deploy_mainline
-      quay.wait_for_automated_build(repo: env.quay_repository, git_sha: env.commit)
-      image_id = quay.docker_image_id_for_tag(repo: env.quay_repository, tag: 'latest') # FIXME
-      quay.put_tag(repo: env.quay_repository, image_id: image_id, tag: env.commit)
-      puts "attached tag #{env.commit} to image #{image_id}"
+      image_id = quay.docker_image_id_for_tag(repo: env.quay_repository, tag: env.commit)
+      if image_id
+        # Skip if docker tag for the commit already exists
+        # This typically happens when a CI build is manually restarted
+        puts "Found the tagged image #{env.commit}"
+      else
+        quay.wait_for_automated_build(repo: env.quay_repository, git_sha: env.commit)
+        image_id = quay.docker_image_id_for_tag(repo: env.quay_repository, tag: 'latest') # FIXME
+        quay.put_tag(repo: env.quay_repository, image_id: image_id, tag: env.commit)
+        puts "attached tag #{env.commit} to image #{image_id}"
+      end
+
       bcn_deploy(env.commit, env.mainline_heritage_token)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcnd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kazunori Kajihiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -42,30 +42,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '0'
 description: Degica's opinionated deployment tool.
 email:
 - kkajihiro@degica.com
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Degica's opinionated deployment tool