bosh-director 1.2596.0 → 1.2597.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/bosh/director/jobs/update_release.rb +7 -20
  2. data/lib/bosh/director/models/release_version.rb +1 -1
  3. data/lib/bosh/director/version.rb +1 -1
  4. metadata +22 -22
data/lib/bosh/director/jobs/update_release.rb CHANGED
@@ -25,8 +25,6 @@ module Bosh::Director
25
25
  @release_version_model = nil
26
26
 
27
27
  @rebase = !!options["rebase"]
28
- @package_rebase_mapping = {}
29
- @job_rebase_mapping = {}
30
28
 
31
29
  @manifest = nil
32
30
  @name = nil
@@ -136,8 +134,13 @@ module Bosh::Director
136
134
 
137
135
  @release_version_model = Models::ReleaseVersion.new(version_attrs)
138
136
  unless @release_version_model.valid?
139
- raise ReleaseAlreadyExists,
140
- "Release `#{@name}/#{@version}' already exists"
137
+ if @release_version_model.errors[:version] == [:format]
138
+ raise ReleaseVersionInvalid,
139
+ "Release version invalid `#{@name}/#{@version}'"
140
+ else
141
+ raise ReleaseAlreadyExists,
142
+ "Release `#{@name}/#{@version}' already exists"
143
+ end
141
144
  end
142
145
 
143
146
  @release_version_model.save
@@ -150,22 +153,6 @@ module Bosh::Director
150
153
  process_packages
151
154
  process_jobs
152
155
 
153
- unless @package_rebase_mapping.empty?
154
- event_log.begin_stage(
155
- "Rebased packages", @package_rebase_mapping.size)
156
- @package_rebase_mapping.each_pair do |name, transition|
157
- event_log.track("#{name}: #{transition}") {}
158
- end
159
- end
160
-
161
- unless @job_rebase_mapping.empty?
162
- event_log.begin_stage(
163
- "Rebased jobs", @job_rebase_mapping.size)
164
- @job_rebase_mapping.each_pair do |name, transition|
165
- event_log.track("#{name}: #{transition}") {}
166
- end
167
- end
168
-
169
156
  event_log.begin_stage("Release has been created", 1)
170
157
  event_log.track("#{@name}/#{@version}") {}
171
158
  end
data/lib/bosh/director/models/release_version.rb CHANGED
@@ -6,9 +6,9 @@ module Bosh::Director::Models
6
6
  many_to_many :deployments
7
7
 
8
8
  def validate
9
+ validates_format VALID_ID, :version
9
10
  validates_presence [:release_id, :version]
10
11
  validates_unique [:release_id, :version]
11
- validates_format VALID_ID, :version
12
12
  end
13
13
 
14
14
  def dependencies(package_name)
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2596.0'
3
+ VERSION = '1.2597.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2596.0
4
+ version: 1.2597.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-06-07 00:00:00.000000000 Z
12
+ date: 2014-06-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.2596.0
37
+ version: 1.2597.0
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - ~>
44
44
  - !ruby/object:Gem::Version
45
- version: 1.2596.0
45
+ version: 1.2597.0
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: bosh-core
48
48
  requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - ~>
52
52
  - !ruby/object:Gem::Version
53
- version: 1.2596.0
53
+ version: 1.2597.0
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: 1.2596.0
61
+ version: 1.2597.0
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: bosh-director-core
64
64
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
66
66
  requirements:
67
67
  - - ~>
68
68
  - !ruby/object:Gem::Version
69
- version: 1.2596.0
69
+ version: 1.2597.0
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  requirements:
75
75
  - - ~>
76
76
  - !ruby/object:Gem::Version
77
- version: 1.2596.0
77
+ version: 1.2597.0
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: bosh_common
80
80
  requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
82
82
  requirements:
83
83
  - - ~>
84
84
  - !ruby/object:Gem::Version
85
- version: 1.2596.0
85
+ version: 1.2597.0
86
86
  type: :runtime
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
90
90
  requirements:
91
91
  - - ~>
92
92
  - !ruby/object:Gem::Version
93
- version: 1.2596.0
93
+ version: 1.2597.0
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: bosh_cpi
96
96
  requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
98
98
  requirements:
99
99
  - - ~>
100
100
  - !ruby/object:Gem::Version
101
- version: 1.2596.0
101
+ version: 1.2597.0
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
106
106
  requirements:
107
107
  - - ~>
108
108
  - !ruby/object:Gem::Version
109
- version: 1.2596.0
109
+ version: 1.2597.0
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: bosh_openstack_cpi
112
112
  requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
114
114
  requirements:
115
115
  - - ~>
116
116
  - !ruby/object:Gem::Version
117
- version: 1.2596.0
117
+ version: 1.2597.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
122
122
  requirements:
123
123
  - - ~>
124
124
  - !ruby/object:Gem::Version
125
- version: 1.2596.0
125
+ version: 1.2597.0
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: bosh_aws_cpi
128
128
  requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
130
130
  requirements:
131
131
  - - ~>
132
132
  - !ruby/object:Gem::Version
133
- version: 1.2596.0
133
+ version: 1.2597.0
134
134
  type: :runtime
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
138
138
  requirements:
139
139
  - - ~>
140
140
  - !ruby/object:Gem::Version
141
- version: 1.2596.0
141
+ version: 1.2597.0
142
142
  - !ruby/object:Gem::Dependency
143
143
  name: bosh_vsphere_cpi
144
144
  requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
146
146
  requirements:
147
147
  - - ~>
148
148
  - !ruby/object:Gem::Version
149
- version: 1.2596.0
149
+ version: 1.2597.0
150
150
  type: :runtime
151
151
  prerelease: false
152
152
  version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
154
154
  requirements:
155
155
  - - ~>
156
156
  - !ruby/object:Gem::Version
157
- version: 1.2596.0
157
+ version: 1.2597.0
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: bosh_warden_cpi
160
160
  requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
162
162
  requirements:
163
163
  - - ~>
164
164
  - !ruby/object:Gem::Version
165
- version: 1.2596.0
165
+ version: 1.2597.0
166
166
  type: :runtime
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
170
170
  requirements:
171
171
  - - ~>
172
172
  - !ruby/object:Gem::Version
173
- version: 1.2596.0
173
+ version: 1.2597.0
174
174
  - !ruby/object:Gem::Dependency
175
175
  name: bosh_vcloud_cpi
176
176
  requirement: !ruby/object:Gem::Requirement
@@ -477,7 +477,7 @@ dependencies:
477
477
  version: 1.1.0
478
478
  description: ! 'BOSH Director
479
479
 
480
- 3c1470'
480
+ cf1a10'
481
481
  email: support@cloudfoundry.com
482
482
  executables:
483
483
  - bosh-director
@@ -739,7 +739,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
739
739
  version: '0'
740
740
  segments:
741
741
  - 0
742
- hash: -3703569249647131017
742
+ hash: -1096428970105629920
743
743
  requirements: []
744
744
  rubyforge_project:
745
745
  rubygems_version: 1.8.23.2