Pass external_url from environment if job doesn't have one

Also update the document and add a changelog entry

1 files changed, 9 insertions, 3 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index e50ea0e566a..5e2f8cda356 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -501,9 +501,15 @@ module Ci
     def persisted_environment_variables
       variables = persisted_environment.predefined_variables
 
-      variables << { key: 'CI_ENVIRONMENT_URL',
-                     value: expanded_environment_url,
-                     public: true } if environment_url
+      if environment_url
+        variables << { key: 'CI_ENVIRONMENT_URL',
+                       value: expanded_environment_url,
+                       public: true }
+      elsif persisted_environment.external_url.present?
+        variables << { key: 'CI_ENVIRONMENT_URL',
+                       value: persisted_environment.external_url,
+                       public: true }
+      end
 
       variables
     end