Hello community, here is the log from the commit of package velum for openSUSE:Factory checked in at 2018-03-13 10:24:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/velum (Old) and /work/SRC/openSUSE:Factory/.velum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "velum" Tue Mar 13 10:24:11 2018 rev:12 rq:585869 version:3.0.0+dev+git_r670_a808a80f6484c097cb87f9e380fdf0b646981986 Changes: -------- --- /work/SRC/openSUSE:Factory/velum/velum.changes 2018-03-09 10:47:38.356423385 +0100 +++ /work/SRC/openSUSE:Factory/.velum.new/velum.changes 2018-03-13 10:24:15.741289282 +0100 @@ -1,0 +2,21 @@ +Mon Mar 12 12:44:12 UTC 2018 - [email protected] + +- Commit 52980f3 by Kiall Mac Innes [email protected] + Fix db/seeds creation of SUSE registry URL record + + This currently fails, as the method does not exist: + + NoMethodError: undefined method `find_or_initialize' for + #<ActiveRecord::Relation []> + + +------------------------------------------------------------------- +Mon Mar 12 09:49:36 UTC 2018 - [email protected] + +- Commit c6c9184 by Maximilian Meister [email protected] + prevent multiple orchestrations at the same time + + Signed-off-by: Maximilian Meister <[email protected]> + + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ velum.spec ++++++ --- /var/tmp/diff_new_pack.HyCdTl/_old 2018-03-13 10:24:16.709254601 +0100 +++ /var/tmp/diff_new_pack.HyCdTl/_new 2018-03-13 10:24:16.709254601 +0100 @@ -23,7 +23,7 @@ # Version: 1.0.0 # %%define branch 1.0.0 -Version: 3.0.0+dev+git_r666_49d2721eff73ac568a7b0632a322b4d4face3f5e +Version: 3.0.0+dev+git_r670_a808a80f6484c097cb87f9e380fdf0b646981986 Release: 0 %define branch master Summary: Dashboard for CaasP @@ -96,7 +96,7 @@ %description velum is the dashboard for CaasP to manage and deploy kubernetes clusters on top of MicroOS -This package has been built with commit 49d2721eff73ac568a7b0632a322b4d4face3f5e from branch master on date Fri, 09 Mar 2018 07:48:13 +0000 +This package has been built with commit a808a80f6484c097cb87f9e380fdf0b646981986 from branch master on date Mon, 12 Mar 2018 12:43:27 +0000 %prep %setup -q -n velum-%{branch} ++++++ master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/app/models/orchestration.rb new/velum-master/app/models/orchestration.rb --- old/velum-master/app/models/orchestration.rb 2018-03-09 08:47:38.000000000 +0100 +++ new/velum-master/app/models/orchestration.rb 2018-03-12 13:43:41.000000000 +0100 @@ -4,6 +4,7 @@ # Orchestration represents a salt orchestration event class Orchestration < ApplicationRecord class OrchestrationAlreadyRan < StandardError; end + class OrchestrationOngoing < StandardError; end enum kind: [:bootstrap, :upgrade] enum status: [:in_progress, :succeeded, :failed] @@ -26,9 +27,14 @@ # rubocop:enable Rails/SkipsModelValidations def self.run(kind: :bootstrap) + raise OrchestrationOngoing unless runnable? Orchestration.create!(kind: kind).tap(&:run) end + def self.runnable? + Orchestration.in_progress.empty? + end + def self.retryable?(kind: :bootstrap) case kind when :bootstrap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/db/seeds.rb new/velum-master/db/seeds.rb --- old/velum-master/db/seeds.rb 2018-03-09 08:47:38.000000000 +0100 +++ new/velum-master/db/seeds.rb 2018-03-12 13:43:41.000000000 +0100 @@ -12,7 +12,7 @@ end def seed_production - Registry.where(name: "SUSE").find_or_initialize.tap do |r| + Registry.where(name: "SUSE").first_or_initialize.tap do |r| r.url = "https://registry.suse.com"; r.save end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/spec/models/orchestration_spec.rb new/velum-master/spec/models/orchestration_spec.rb --- old/velum-master/spec/models/orchestration_spec.rb 2018-03-09 08:47:38.000000000 +0100 +++ new/velum-master/spec/models/orchestration_spec.rb 2018-03-12 13:43:41.000000000 +0100 @@ -72,6 +72,10 @@ it "is not retryable" do expect(described_class).not_to be_retryable(kind: :bootstrap) end + + it "is not runnable" do + expect(described_class).not_to be_runnable + end end context "when the last orchestration was a failure" do @@ -110,6 +114,10 @@ it "is not retryable" do expect(described_class).not_to be_retryable(kind: :upgrade) end + + it "is not runnable" do + expect(described_class).not_to be_runnable + end end context "when the last orchestration was a failure" do
