solano 1.31.10 → 1.31.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4da4f4f8e4baaad65f0c1fb3e25ae8d4c8c0e918
-  data.tar.gz: e1e8e5945dc15ad77b3d96f0e62266e3abcf309e
+  metadata.gz: 0e3f777963ff4ba7d7d29a648d8381f9133ac8a8
+  data.tar.gz: f975a434acb278412e4c91d24310a36961818ef2
 SHA512:
-  metadata.gz: 6edb2b435228c1608bb27251b8181934c8c7fb81a338bd4a2bda544277edeed3e3911644385bc5092e326ea939b97e125ae2c0d1cd5b85a1aa011521427e1227
-  data.tar.gz: cd3f377c98c6e731ee7082c4b4ea2fee032d678c4a4f244aa5a91747b5f23bf9c3363f4567d6a90c842316f7e9f5a5882f7540d7c58827d089a36f41b63ad5cb
+  metadata.gz: 4891443cf77f11d21b08e193e2a59af67648129b0a525a3572514e256d4193932f6f720075dd373921533df2326f7eb18b40effa577dbc3a55c0428cd1979c23
+  data.tar.gz: 4b77d4b6ded750aab37667a20993429af93c53d8b3c76d59d446e9c8d9211ee837740855bb55d5f0980d8ec648862654ca47845e608ca86a7a574944d440c08b

data/lib/solano/cli/commands/rerun.rb

@@ -10,6 +10,7 @@ module Solano
     method_option :force, :type=>:boolean, :default => false
     method_option :profile, :type => :string, :default => nil, :aliases => %w(--profile-name)
     method_option :queue, :type => :string, :default => nil
+    method_option :pipeline, type: :string, default: nil
     def rerun(session_id=nil)
       params = {:scm => true, :repo => false}
       if session_id.nil? then
@@ -38,6 +39,7 @@ module Solano
       cmd += " --force" if options[:force]
       cmd += " --profile=#{profile}" if profile
       cmd += " --queue=#{options[:queue]}" if options[:queue]
+      cmd += " --pipeline=#{options[:pipeline]}" if options[:pipeline]
       cmd += " #{tests.join(" ")}"
 
       say cmd
@@ -49,7 +51,7 @@ module Solano
     def session_id_for_current_suite
       return unless suite_for_current_branch?
       suite_params = {
-        :suite_id => @solano_api.current_suite_id,
+        :suite_id => calc_current_suite_id,
         :active => false,
         :limit => 1,
         :origin => %w(ci cli)

data/lib/solano/cli/commands/spec.rb

@@ -27,15 +27,26 @@ module Solano
     method_option :default_branch, :type => :string, :default => nil
     method_option :force_snapshot, :type => :boolean, :default => false
     method_option :volume, :type => :string, :default => nil
+    method_option :pipeline, type: :string, default: nil
     def spec(*pattern)
       machine_data = {}
 
       solano_setup({:repo => true})
 
-      suite_auto_configure unless options[:machine]
+      unless options[:pipeline]
+        suites = @solano_api.get_suites.select { |suite| suite['repo_url'] == @scm.origin_url }
+        repo_names = suites.map { |suite| suite['repo_name'] }.uniq
+        if repo_names.count > 1
+          say "You already have pipelines with url: #{@scm.origin_url}"
+          repo_names.each { |repo_name| say " " + repo_name }
+          exit_failure "You must specify an pipeline by passing the --pipeline option."
+        end
+      end
 
+      suite_auto_configure unless options[:machine]
       exit_failure unless suite_for_current_branch?
 
+      suite_id = calc_current_suite_id
       if !options[:machine] && @solano_api.get_keys.empty? then
         warn(Text::Warning::NO_SSH_KEY)
       end
@@ -81,9 +92,9 @@ module Solano
       end
 
        # Call the API to get the suite and its tests
-      suite_details = @solano_api.get_suite_by_id(@solano_api.current_suite_id,
-                                                    :session_id => options[:session_id])
 
+      suite_details = @solano_api.get_suite_by_id(suite_id,
+                                                    :session_id => options[:session_id])
       start_time = Time.now
 
       new_session_params = {
@@ -135,7 +146,7 @@ module Solano
       session_data = if session_id && session_id > 0
         @solano_api.update_session(session_id, new_session_params)
       else
-        sess, manager = @solano_api.create_session(@solano_api.current_suite_id, new_session_params)
+        sess, manager = @solano_api.create_session(suite_id, new_session_params)
         sess
       end
 
@@ -186,7 +197,7 @@ module Solano
         machine_data[:session_id] = session_id
 
         # Register the tests
-        @solano_api.register_session(session_id, @solano_api.current_suite_id, test_pattern, test_exclude_pattern)
+        @solano_api.register_session(session_id, suite_id, test_pattern, test_exclude_pattern)
 
         # Start the tests
         start_test_executions = @solano_api.start_session(session_id, test_execution_params)
@@ -290,7 +301,7 @@ module Solano
       say Text::Process::SUMMARY_STATUS % session_status
       say ""
 
-      suite = suite_details.merge({"id" => @solano_api.current_suite_id})
+      suite = suite_details.merge({"id" => suite_id})
       @api_config.set_suite(suite)
       @api_config.write_config
 

data/lib/solano/cli/commands/status.rb

@@ -9,6 +9,7 @@ module Solano
     method_option :commit, :type => :string, :default => nil
     method_option :account, :type => :string, :default => nil,
                   :aliases => %w(--org --organization)
+    method_option :pipeline, type: :string, default: nil
     def status
       solano_setup({:repo => true})
 
@@ -16,9 +17,8 @@ module Solano
         # solano_setup asserts that we're in a supported SCM repo
         origin_url = @scm.origin_url
         repo_params = {
-          :active => true,
-          :repo_url => origin_url
-        }
+          :active => true
+       }
 
         if suite_for_current_branch? then
           status_branch = @solano_api.current_branch
@@ -40,7 +40,12 @@ module Solano
           suite_params[:last_commit_id] = options[:commit]
         end
 
-        suites = @solano_api.get_suites(:repo_url => origin_url, :branch => status_branch)
+        if options[:pipeline]
+          suites = @solano_api.get_suites(:branch => status_branch).select { |s| s['repo_name'] == options[:pipeline] }
+        else
+          suites = @solano_api.get_suites(:repo_url => origin_url, :branch => status_branch)
+        end
+
         if suites.count == 0
           exit_failure Text::Error::CANT_FIND_SUITE % [origin_url, status_branch]
         elsif suites.count > 1
@@ -59,6 +64,7 @@ module Solano
         end
 
         suite_params[:suite_id] = suites.first['id']
+        repo_params[:suite_id] = suites.first['id'] 
 
         if options[:json] 
           res = {}

data/lib/solano/cli/suite.rb

@@ -23,15 +23,14 @@ module Solano
       # Did the user set a configuration option on the command line?
       # If so, auto-configure a new suite and re-configure an existing one
       user_config = options.member?(:tool)
-
-      current_suite_id = @solano_api.current_suite_id
+      current_suite_id = calc_current_suite_id
       if current_suite_id && !user_config then
         current_suite = @solano_api.get_suite_by_id(current_suite_id)
       else
         params = Hash.new
         params[:branch] = @scm.current_branch
         params[:repo_url] = @scm.origin_url
-        params[:repo_name] = @scm.repo_name
+        params[:repo_name] = options[:pipeline] || @scm.repo_name
         params[:scm] = @scm.scm_name
         if options[:account] && !params.member?(:account_id) then
           account_id = @solano_api.get_account_id(options[:account])
@@ -63,8 +62,22 @@ module Solano
       details
     end
 
+    def calc_current_suite_id
+      if options[:pipeline] && options[:account]
+        suites = @solano_api.get_suites.select { |s| s['repo_name'] == options[:pipeline] && s['account'] == options[:account] }
+        suite = suites.select { |s| s['branch'] == @scm.current_branch }.first
+        suite ? suite['id'] : nil
+      elsif options[:pipeline]
+        suites = @solano_api.get_suites.select { |s| s['repo_name'] == options[:pipeline] }
+        suite = suites.select { |s| s['branch'] == @scm.current_branch }.first
+        suite ? suite['id'] : nil
+      else
+        @solano_api.current_suite_id
+      end
+    end
+
     def suite_for_current_branch?
-      return true if @solano_api.current_suite_id
+      return true if calc_current_suite_id
       say Text::Error::NO_SUITE_EXISTS % @scm.current_branch
       false
     end

data/lib/solano/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2011-2017 Solano Labs All Rights Reserved
 
 module Solano
-  VERSION = "1.31.10"
+  VERSION = "1.31.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solano
 version: !ruby/object:Gem::Version
-  version: 1.31.10
+  version: 1.31.11
 platform: ruby
 authors:
 - GE Digital LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -411,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Run tests in Predix CI Hosted Test Environment