Separate environment from the simple variables

app/models/ci/build.rb

@@ -198,24 +198,25 @@ module Ci
 
     # Variables whose value does not depend on other variables
     def simple_variables
+      variables(with_environment: false)
+    end
+
+    # All variables, including those dependent on other variables
+    def variables(with_environment: true)
       variables = predefined_variables
       variables += project.predefined_variables
       variables += pipeline.predefined_variables
       variables += runner.predefined_variables if runner
       variables += project.container_registry_variables
       variables += project.deployment_variables if has_environment?
+      variables += persisted_environment_variables if with_environment
       variables += yaml_variables
       variables += user_variables
-      variables += secret_variables
+      variables += secret_variables(with_environment: with_environment)
       variables += trigger_request.user_variables if trigger_request
       variables
     end
 
-    # All variables, including those dependent on other variables
-    def variables
-      simple_variables.concat(persisted_environment_variables)
-    end
-
     def merge_request
       return @merge_request if defined?(@merge_request)
 
@@ -391,10 +392,16 @@ module Ci
       ]
     end
 
-    def secret_variables
-      project.secret_variables_for(
-        ref: ref, environment: persisted_environment)
-        .map(&:to_runner_variable)
+    def secret_variables(with_environment: true)
+      variables = project.secret_variables_for(ref: ref)
+
+      if with_environment
+        variables.concat(
+          project.secret_variables_for(
+            ref: ref, environment: persisted_environment))
+      end
+
+      variables.map(&:to_runner_variable)
     end
 
     def steps

app/models/ee/project.rb

@@ -77,7 +77,7 @@ module EE
       end
     end
 
-    def secret_variables_for(ref:, environment:)
+    def secret_variables_for(ref:, environment: nil)
       query = super
 
       # Full wildcard has the least priority