Merge "Added some more checks at the validate jobs command"

cloudfoundry · Nov 9, 2012 · 2b13908 · 2b13908
2 parents 0a724f7 + fbc75d3
commit 2b13908
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/cli/lib/cli/commands/deployment.rb b/cli/lib/cli/commands/deployment.rb
@@ -136,8 +136,19 @@ def validate_jobs
       check_if_release_dir
       manifest = prepare_deployment_manifest(:resolve_properties => true)
 
-      nl
-      say("Analyzing release directory...".yellow)
+      if manifest["release"]
+        release_name = manifest["release"]["name"]
+      elsif manifest["releases"].count > 1
+        err("Cannot validate a deployment manifest with more than 1 release")
+      else
+        release_name = manifest["releases"].first["name"]
+      end
+      if release_name == release.dev_name || release_name == release.final_name
+        nl
+        say("Analyzing release directory...".yellow)
+      else
+        err("This release was not found in deployment manifest")
+      end
 
       say(" - discovering packages")
       packages = Bosh::Cli::PackageBuilder.discover(

diff --git a/cli/spec/unit/job_property_validator_spec.rb b/cli/spec/unit/job_property_validator_spec.rb
@@ -3,5 +3,5 @@
 require "spec_helper"
 
 describe Bosh::Cli::JobPropertyValidator do
-
+  pending "needs tests"
 end