ci: some jjbb improvements (elastic#19588)

* ci: some jjbb improvements * ci: fix build ITs docker images job
melchiormoulin · Oct 14, 2020 · c6085c1 · c6085c1
1 parent 9a486f3
commit c6085c1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/.ci/jobs/apm-beats-update.yml b/.ci/jobs/apm-beats-update.yml
@@ -5,7 +5,6 @@
     view: Beats
     concurrent: true
     project-type: multibranch
-    periodic-folder-trigger: 1w
     prune-dead-branches: true
     number-to-keep: 10
     days-to-keep: 30
@@ -19,20 +18,19 @@
         discover-pr-forks-trust: 'permission'
         discover-pr-origin: 'merge-current'
         discover-tags: true
+        head-filter-regex: '(master|7\.[x789]|8\.\d+|PR-.*)'
         disable-pr-notifications: true
         notification-context: 'apm-beats-update'
-        property-strategies:
-          all-branches:
-          - suppress-scm-triggering: true
         repo: 'beats'
         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
         - tags:
             ignore-tags-older-than: -1
-            ignore-tags-newer-than: -1
+            ignore-tags-newer-than: 30
         - named-branches:
             - exact-name:
                 name: 'master'

diff --git a/.ci/jobs/beats.yml b/.ci/jobs/beats.yml
@@ -6,7 +6,6 @@
     view: Beats
     concurrent: true
     project-type: multibranch
-    periodic-folder-trigger: 1w
     prune-dead-branches: true
     number-to-keep: 10
     days-to-keep: 30
@@ -19,6 +18,7 @@
         discover-pr-forks-strategy: 'merge-current'
         discover-pr-forks-trust: 'permission'
         discover-pr-origin: 'merge-current'
+        head-filter-regex: '(master|7\.[x789]|8\.\d+|PR-.*)'
         discover-tags: true
         notification-context: "beats-ci"
         property-strategies:

diff --git a/.ci/jobs/build-it-docker-images.yml b/.ci/jobs/build-it-docker-images.yml
@@ -15,8 +15,7 @@
       scm:
         - git:
             url: git@github.com:elastic/beats.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/pull/*/head:refs/remotes/origin/pr/*
-            wipe-workspace: 'True'
+            wipe-workspace: true
             name: origin
             shallow-clone: true
             credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba

diff --git a/.ci/jobs/defaults.yml b/.ci/jobs/defaults.yml
@@ -1,4 +1,4 @@
-  
+
 ---
 
 ##### GLOBAL METADATA
@@ -16,5 +16,4 @@
     publishers:
       - email:
           recipients: infra-root+build@elastic.co
-    periodic-folder-trigger: 1w
     prune-dead-branches: true
diff --git a/.ci/jobs/packaging.yml b/.ci/jobs/packaging.yml
@@ -14,17 +14,19 @@
           discover-pr-forks-trust: 'permission'
           discover-pr-origin: 'merge-current'
           discover-tags: true
-          disable-pr-notifications: false
+          head-filter-regex: '(master|7\.[x789]|8\.\d+|PR-.*)'
+          disable-pr-notifications: true
           notification-context: 'beats-packaging'
           repo: 'beats'
           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
           - tags:
-              ignore-tags-older-than: 30
-              ignore-tags-newer-than: -1
+              ignore-tags-older-than: -1
+              ignore-tags-newer-than: 30
           - named-branches:
               - exact-name:
                   name: 'master'