From e621225872abad4c110e510ca4c955c4004a2bcc Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Tue, 13 Jul 2021 13:23:39 +0100
Subject: [PATCH 1/2] [JJBB] for the update-beats

---
 .ci/jobs/apm-server-check-changelogs-mbp.yml |  1 -
 .ci/jobs/apm-server-check-packages-mbp.yml   |  1 -
 .ci/jobs/defaults.yml                        |  1 -
 .ci/jobs/update-beats-mbp.yml                | 43 ++++++++++++++++++++
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 .ci/jobs/update-beats-mbp.yml

diff --git a/.ci/jobs/apm-server-check-changelogs-mbp.yml b/.ci/jobs/apm-server-check-changelogs-mbp.yml
index f7d4789a071..1b6d3d746b7 100644
--- a/.ci/jobs/apm-server-check-changelogs-mbp.yml
+++ b/.ci/jobs/apm-server-check-changelogs-mbp.yml
@@ -38,4 +38,3 @@
         timeout: '15'
         use-author: true
         wipe-workspace: 'True'
-    periodic-folder-trigger: 1w
diff --git a/.ci/jobs/apm-server-check-packages-mbp.yml b/.ci/jobs/apm-server-check-packages-mbp.yml
index ee84c5abad5..6d91f3c00bb 100644
--- a/.ci/jobs/apm-server-check-packages-mbp.yml
+++ b/.ci/jobs/apm-server-check-packages-mbp.yml
@@ -49,4 +49,3 @@
         timeout: '15'
         use-author: true
         wipe-workspace: 'True'
-    periodic-folder-trigger: 1w
diff --git a/.ci/jobs/defaults.yml b/.ci/jobs/defaults.yml
index c4cf1d8427d..83ce01b29e1 100644
--- a/.ci/jobs/defaults.yml
+++ b/.ci/jobs/defaults.yml
@@ -12,7 +12,6 @@
     logrotate:
       numToKeep: 100
     node: linux
-    periodic-folder-trigger: 1w
     prune-dead-branches: true
     publishers:
     - email:
diff --git a/.ci/jobs/update-beats-mbp.yml b/.ci/jobs/update-beats-mbp.yml
new file mode 100644
index 00000000000..879a84271cf
--- /dev/null
+++ b/.ci/jobs/update-beats-mbp.yml
@@ -0,0 +1,43 @@
+---
+- job:
+    name: apm-server/update-beats-mbp
+    display-name: apm-server Update beats
+    description: To keep apm-server up to date with libbeat and beats packaging
+    view: APM-CI
+    project-type: multibranch
+    script-path: .ci/update-beats.groovy
+    scm:
+      - github:
+          branch-discovery: no-pr
+          discover-pr-forks-strategy: merge-current
+          discover-pr-forks-trust: permission
+          discover-pr-origin: merge-current
+          discover-tags: false
+          head-filter-regex: '^(master|PR-.*)$'
+          notification-context: 'update-beats'
+          repo: apm-server
+          repo-owner: elastic
+          credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
+          ssh-checkout:
+            credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
+          build-strategies:
+          - skip-initial-build: true
+          - named-branches:
+              - exact-name:
+                  name: 'master'
+                  case-sensitive: true
+          clean:
+            after: true
+            before: true
+          prune: true
+          shallow-clone: true
+          depth: 4
+          do-not-fetch-tags: true
+          submodule:
+            disable: false
+            recursive: true
+            parent-credentials: true
+            timeout: 100
+          timeout: '15'
+          use-author: true
+          wipe-workspace: 'True'

From 3ef36c28aa9be09b0ed4b6c26649971bb749fc3d Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Tue, 13 Jul 2021 13:28:32 +0100
Subject: [PATCH 2/2] no scm triggering and delegate the responsability to the
 cron configuration

---
 .ci/jobs/update-beats-mbp.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.ci/jobs/update-beats-mbp.yml b/.ci/jobs/update-beats-mbp.yml
index 879a84271cf..2bef42a1e73 100644
--- a/.ci/jobs/update-beats-mbp.yml
+++ b/.ci/jobs/update-beats-mbp.yml
@@ -20,12 +20,9 @@
           credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
           ssh-checkout:
             credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
-          build-strategies:
-          - skip-initial-build: true
-          - named-branches:
-              - exact-name:
-                  name: 'master'
-                  case-sensitive: true
+          property-strategies:
+            all-branches:
+            - suppress-scm-triggering: true
           clean:
             after: true
             before: true