Revert logical validation in CI job stage entry

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 144f9cd7b74..0217a905eac 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -105,6 +105,7 @@ module Ci
       validate_job_keys!(name, job)
       validate_job_types!(name, job)
 
+      validate_job_stage!(name, job) if job[:stage]
       validate_job_variables!(name, job) if job[:variables]
       validate_job_cache!(name, job) if job[:cache]
       validate_job_artifacts!(name, job) if job[:artifacts]
@@ -153,6 +154,12 @@ module Ci
       end
     end
 
+    def validate_job_stage!(name, job)
+      unless job[:stage].is_a?(String) && job[:stage].in?(@stages)
+        raise ValidationError, "#{name} job: stage parameter should be #{@stages.join(", ")}"
+      end
+    end
+
     def validate_job_variables!(name, job)
       unless validate_variables(job[:variables])
         raise ValidationError,