Update support for dynamic environments

2 files changed, 9 insertions, 9 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 47dedef38d0..d5724af4cce 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -86,7 +86,7 @@ module Ci
             ref: build.ref,
             tag: build.tag,
             options: build.options[:environment],
-            variables: variables)
+            variables: build.variables)
           service.execute(build)
         end
       end
diff --git a/app/services/create_deployment_service.rb b/app/services/create_deployment_service.rb
index 577ba731583..e6667132e27 100644
--- a/app/services/create_deployment_service.rb
+++ b/app/services/create_deployment_service.rb
@@ -2,13 +2,7 @@ require_relative 'base_service'
 
 class CreateDeploymentService < BaseService
   def execute(deployable = nil)
-    environment = project.environments.find_or_create_by(
-      name: expanded_name
-    )
-
-    if expanded_url
-      environment.external_url = expanded_url
-    end
+    environment = find_or_create_environment
 
     project.deployments.create(
       environment: environment,
@@ -22,6 +16,12 @@ class CreateDeploymentService < BaseService
 
   private
 
+  def find_or_create_environment
+    project.environments.find_or_create_by(name: expanded_name) do |environment|
+      environment.external_url = expanded_url
+    end
+  end
+
   def expanded_name
     ExpandVariables.expand(name, variables)
   end
@@ -41,7 +41,7 @@ class CreateDeploymentService < BaseService
   end
 
   def options
-    params[:environment] || {}
+    params[:options] || {}
   end
 
   def variables