Merge branch 'master' into docs-patch-71docs-patch-71

1 files changed, 9 insertions, 1 deletions

diff --git a/scripts/trigger-build b/scripts/trigger-build
index 9c5fc3c76a5..4d8110fce10 100755
--- a/scripts/trigger-build
+++ b/scripts/trigger-build
@@ -122,7 +122,14 @@ module Trigger
     end
 
     def ref
-      ENV['CNG_BRANCH'] || 'master'
+      default_ref =
+        if ENV['CI_COMMIT_REF_NAME'] =~ /^[\d-]+-stable(-ee)?$/
+          ENV['CI_COMMIT_REF_NAME']
+        else
+          'master'
+        end
+
+      ENV['CNG_BRANCH'] || default_ref
     end
 
     def trigger_token
@@ -142,6 +149,7 @@ module Trigger
         "GITLAB_VERSION" => ENV['CI_COMMIT_REF_NAME'],
         "GITLAB_TAG" => ENV['CI_COMMIT_TAG'],
         "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_REF_SLUG'],
+        "FORCE_RAILS_IMAGE_BUILDS" => 'true',
         "#{edition}_PIPELINE" => 'true'
       }
     end