as suggested in the code review

Mage will be the way to go in the future, for such let's search for x-pack in the directory parameter or target (target is a bit more complex as it support more values than the folder only)

Jenkinsfile

@@ -776,7 +776,7 @@ def makeTarget(Map args = [:]) {
   def clean = args.get('clean', true)
   def withModule = args.get('withModule', false)
   withGithubNotify(context: "${context}") {
-    withBeatsEnv(archive: true, withModule: withModule, modulePattern: env.OSS_MODULE_PATTERN) {
+    withBeatsEnv(archive: true, withModule: withModule, modulePattern: getModulePattern(target)) {
       whenTrue(params.debug) {
         dumpFilteredEnvironment()
         dumpMage()
@@ -795,7 +795,7 @@ def mageTarget(Map args = [:]) {
   def target = args.target
   def withModule = args.get('withModule', false)
   withGithubNotify(context: "${context}") {
-    withBeatsEnv(archive: true, withModule: withModule, modulePattern: env.XPACK_MODULE_PATTERN) {
+    withBeatsEnv(archive: true, withModule: withModule, modulePattern: getModulePattern(directory)) {
       whenTrue(params.debug) {
         dumpFilteredEnvironment()
         dumpMage()
@@ -815,7 +815,7 @@ def mageTargetWin(Map args = [:]) {
   def target = args.target
   def withModule = args.get('withModule', false)
   withGithubNotify(context: "${context}") {
-    withBeatsEnvWin(withModule: withModule, modulePattern: env.XPACK_MODULE_PATTERN) {
+    withBeatsEnvWin(withModule: withModule, modulePattern: getModulePattern(directory)) {
       whenTrue(params.debug) {
         dumpFilteredEnvironment()
         dumpMageWin()
@@ -829,6 +829,11 @@ def mageTargetWin(Map args = [:]) {
   }
 }
 
+def getModulePattern(String toCompare) {
+  // Use contains to support the makeTarget(target: '-C <folder>') while mageTarget(directory: '<folder>')
+  return (toCompare.contains('x-pack') ? env.XPACK_MODULE_PATTERN : env.OSS_MODULE_PATTERN)
+}
+
 def withBeatsEnv(Map args = [:], Closure body) {
   def archive = args.get('archive', true)
   def withModule = args.get('withModule', false)