1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/entry/product/variables.rb b/lib/gitlab/ci/config/entry/product/variables.rb
index ac4f70fb69e..2481989060e 100644
--- a/lib/gitlab/ci/config/entry/product/variables.rb
+++ b/lib/gitlab/ci/config/entry/product/variables.rb
@@ -14,7 +14,7 @@ module Gitlab
             validations do
               validates :config, variables: { array_values: true }
               validates :config, length: {
-                minimum: 2,
+                minimum: :minimum,
                 too_short: 'requires at least %{count} items'
               }
             end
@@ -28,6 +28,10 @@ module Gitlab
                 .map { |key, value| [key.to_s, Array(value).map(&:to_s)] }
                 .to_h
             end
+
+            def minimum
+              ::Gitlab::Ci::Features.one_dimensional_matrix_enabled? ? 1 : 2
+            end
           end
         end
       end