From f1ce8e14b4730ee6e3c16c7b0d9faf1ae55c2a14 Mon Sep 17 00:00:00 2001
From: Andrew Kroh <andrew.kroh@elastic.co>
Date: Thu, 23 Apr 2020 08:45:45 -0400
Subject: [PATCH] Update Platform selector in packaging job (#17908)

Specify each target platform that we want a package for.
This works around an issue with filters mixing adds ('!') and removes ('+')
and the default set that gets applied in this case.
---
 .ci/packaging.groovy | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
index e35a574c5fa..36734003aba 100644
--- a/.ci/packaging.groovy
+++ b/.ci/packaging.groovy
@@ -76,7 +76,19 @@ pipeline {
             }
             environment {
               HOME = "${env.WORKSPACE}"
-              PLATFORMS = "!darwin +linux/armv7 +linux/ppc64le +linux/s390x +linux/mips64"
+              PLATFORMS = [
+                '+all',
+                'linux/amd64',
+                'linux/386',
+                'linux/arm64',
+                'linux/armv7',
+                'linux/ppc64le',
+                'linux/mips64',
+                'linux/s390x',
+                'windows/amd64',
+                'windows/386',
+                (params.macos ? '' : 'darwin/amd64'),
+              ].join(' ')
             }
             steps {
               release()
@@ -94,7 +106,10 @@ pipeline {
             }
             environment {
               HOME = "${env.WORKSPACE}"
-              PLATFORMS = "!defaults +darwin/amd64"
+              PLATFORMS = [
+                '+all',
+                'darwin/amd64',
+              ].join(' ')
             }
             steps {
               withMacOSEnv(){