From 31260dab796ad0da35991eb7dc5db5aef4af137d Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Tue, 6 Feb 2024 16:12:09 +0100
Subject: [PATCH 1/2] jenkins: support manually triggered through the UI

---
 .ci/packaging.groovy | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
index 137d5b6677e..2097257ff40 100644
--- a/.ci/packaging.groovy
+++ b/.ci/packaging.groovy
@@ -65,10 +65,16 @@ pipeline {
         stage('apmpackage') {
           options { skipDefaultCheckout() }
           when {
-            allOf {
-              // The apmpackage stage gets triggered as described in https://github.com/elastic/apm-server/issues/6970
-              changeset pattern: '(internal/version/.*|apmpackage/.*)', comparator: 'REGEXP'
-              not { changeRequest() }
+            anyOf {
+              allOf {
+                // The apmpackage stage gets triggered as described in https://github.com/elastic/apm-server/issues/6970
+                changeset pattern: '(internal/version/.*|apmpackage/.*)', comparator: 'REGEXP'
+                not { changeRequest() }
+              }
+              // support for manually triggered in the UI
+              expression {
+                return = isUserTrigger()
+              }
             }
           }
           steps {

From 48ba140df133a6e1c6beff334c1e36af7ff6b9e6 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Tue, 6 Feb 2024 16:12:36 +0100
Subject: [PATCH 2/2] use declarative syntax

---
 .ci/packaging.groovy | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
index 2097257ff40..81c566c7fff 100644
--- a/.ci/packaging.groovy
+++ b/.ci/packaging.groovy
@@ -72,9 +72,7 @@ pipeline {
                 not { changeRequest() }
               }
               // support for manually triggered in the UI
-              expression {
-                return = isUserTrigger()
-              }
+              triggeredBy cause: 'UserIdCause'
             }
           }
           steps {