Fix CI job environment configuration attributes

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/gitlab/ci/config/node/environment.rb b/lib/gitlab/ci/config/node/environment.rb
index d2d00f0ad81..bc153854a8d 100644
--- a/lib/gitlab/ci/config/node/environment.rb
+++ b/lib/gitlab/ci/config/node/environment.rb
@@ -11,14 +11,14 @@ module Gitlab
           ALLOWED_KEYS = %i[name url]
 
           validations do
-            validates :name, presence: true
-
             validate do
               unless hash? || string?
                 errors.add(:config, 'should be a hash or a string')
               end
             end
 
+            validates :name, presence: true
+
             with_options if: :hash? do
               validates :config, allowed_keys: ALLOWED_KEYS
 
diff --git a/lib/gitlab/ci/config/node/job.rb b/lib/gitlab/ci/config/node/job.rb
index 3ab34d23d37..6ecc46200c0 100644
--- a/lib/gitlab/ci/config/node/job.rb
+++ b/lib/gitlab/ci/config/node/job.rb
@@ -129,6 +129,7 @@ module Gitlab
               except: except,
               variables: variables_defined? ? variables : nil,
               environment: environment_defined? ? environment : nil,
+              environment_name: environment_defined? ? environment[:name] : nil,
               artifacts: artifacts,
               after_script: after_script }
           end