From cd75c7474b32a2023fca4cdc754c288c47dcd474 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Wed, 15 Jul 2020 15:22:01 +0200
Subject: [PATCH] [meta] use same staging job for all branches

We currently have staging jobs for every branch (6.8, 7.8, 7.x & master).
However, we should only test staging from the minor release branches
(ie: 6.8 & 7.8). In addition, staging jobs are only triggered manually
after a BC, so staging job for a specific branch should rarely have
more than 10 builds. This commit will rationalize and help having a
cleaner Helm charts Jenkins view by using the same staging jobs for
every branches.

Note that staging jobs templates should be removed from the other
branches.
---
 .../elastic+helm-charts+staging+cluster-cleanup.yml    | 10 +++++++++-
 .../elastic+helm-charts+staging+cluster-creation.yml   | 10 +++++++++-
 ...stic+helm-charts+staging+integration-apm-server.yml | 10 +++++++++-
 ...c+helm-charts+staging+integration-elasticsearch.yml | 10 +++++++++-
 ...lastic+helm-charts+staging+integration-filebeat.yml | 10 +++++++++-
 .../elastic+helm-charts+staging+integration-kibana.yml | 10 +++++++++-
 ...lastic+helm-charts+staging+integration-logstash.yml | 10 +++++++++-
 ...stic+helm-charts+staging+integration-metricbeat.yml | 10 +++++++++-
 .ci/jobs/elastic+helm-charts+staging.yml               | 10 +++++++++-
 9 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml b/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml
index df2daf77d..62416fb0e 100644
--- a/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml
+++ b/.ci/jobs/elastic+helm-charts+staging+cluster-cleanup.yml
@@ -6,9 +6,14 @@
     parameters:
       - string:
           name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
+          description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)"
+      - string:
+          name: BRANCH
+          description: "The helm-charts repo branch to use. (Example: 7.8)"
     scm:
     - git:
+        branches:
+        - $BRANCH
         wipe-workspace: 'True'
     axes:
     - axis:
@@ -20,6 +25,9 @@
         type: yaml
         name: KUBERNETES_VERSION
         filename: helpers/matrix.yml
+    wrappers:
+    - build-name:
+        name: "${BUILD_NUMBER} - ${BRANCH} - ${BUILD_ID}"
     builders:
     - shell: |-
         #!/usr/local/bin/runbld
diff --git a/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml b/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml
index 8770a257a..b67c7067d 100644
--- a/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml
+++ b/.ci/jobs/elastic+helm-charts+staging+cluster-creation.yml
@@ -6,9 +6,14 @@
     parameters:
       - string:
           name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
+          description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)"
+      - string:
+          name: BRANCH
+          description: "The helm-charts repo branch to use. (Example: 7.8)"
     scm:
     - git:
+        branches:
+        - $BRANCH
         wipe-workspace: 'True'
     axes:
     - axis:
@@ -20,6 +25,9 @@
         type: yaml
         name: KUBERNETES_VERSION
         filename: helpers/matrix.yml
+    wrappers:
+    - build-name:
+        name: "${BUILD_NUMBER} - ${BRANCH} - ${BUILD_ID}"
     builders:
     - shell: |-
         #!/usr/local/bin/runbld
diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml b/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml
index cba2c4a69..7675cced9 100644
--- a/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml
+++ b/.ci/jobs/elastic+helm-charts+staging+integration-apm-server.yml
@@ -6,9 +6,14 @@
     parameters:
       - string:
           name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
+          description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)"
+      - string:
+          name: BRANCH
+          description: "The helm-charts repo branch to use. (Example: 7.8)"
     scm:
     - git:
+        branches:
+        - $BRANCH
         wipe-workspace: 'True'
     axes:
     - axis:
@@ -24,6 +29,9 @@
         type: yaml
         name: KUBERNETES_VERSION
         filename: helpers/matrix.yml
+    wrappers:
+    - build-name:
+        name: "${BUILD_NUMBER} - ${BRANCH} - ${BUILD_ID}"
     builders:
     - shell: |-
         #!/usr/local/bin/runbld
diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-elasticsearch.yml b/.ci/jobs/elastic+helm-charts+staging+integration-elasticsearch.yml
index ef499b214..6b7049c44 100644
--- a/.ci/jobs/elastic+helm-charts+staging+integration-elasticsearch.yml
+++ b/.ci/jobs/elastic+helm-charts+staging+integration-elasticsearch.yml
@@ -6,9 +6,14 @@
     parameters:
       - string:
           name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
+          description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)"
+      - string:
+          name: BRANCH
+          description: "The helm-charts repo branch to use. (Example: 7.8)"
     scm:
     - git:
+        branches:
+        - $BRANCH
         wipe-workspace: 'True'
     axes:
     - axis:
@@ -24,6 +29,9 @@
         type: yaml
         name: KUBERNETES_VERSION
         filename: helpers/matrix.yml
+    wrappers:
+    - build-name:
+        name: "${BUILD_NUMBER} - ${BRANCH} - ${BUILD_ID}"
     builders:
     - shell: |-
         #!/usr/local/bin/runbld
diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-filebeat.yml b/.ci/jobs/elastic+helm-charts+staging+integration-filebeat.yml
index f0d227cd3..eaffabfa5 100644
--- a/.ci/jobs/elastic+helm-charts+staging+integration-filebeat.yml
+++ b/.ci/jobs/elastic+helm-charts+staging+integration-filebeat.yml
@@ -6,9 +6,14 @@
     parameters:
       - string:
           name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
+          description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)"
+      - string:
+          name: BRANCH
+          description: "The helm-charts repo branch to use. (Example: 7.8)"
     scm:
     - git:
+        branches:
+        - $BRANCH
         wipe-workspace: 'True'
     axes:
     - axis:
@@ -24,6 +29,9 @@
         type: yaml
         name: KUBERNETES_VERSION
         filename: helpers/matrix.yml
+    wrappers:
+    - build-name:
+        name: "${BUILD_NUMBER} - ${BRANCH} - ${BUILD_ID}"
     builders:
     - shell: |-
         #!/usr/local/bin/runbld
diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-kibana.yml b/.ci/jobs/elastic+helm-charts+staging+integration-kibana.yml
index f4a8e402b..6bb355dd2 100644
--- a/.ci/jobs/elastic+helm-charts+staging+integration-kibana.yml
+++ b/.ci/jobs/elastic+helm-charts+staging+integration-kibana.yml
@@ -6,9 +6,14 @@
     parameters:
       - string:
           name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
+          description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)"
+      - string:
+          name: BRANCH
+          description: "The helm-charts repo branch to use. (Example: 7.8)"
     scm:
     - git:
+        branches:
+        - $BRANCH
         wipe-workspace: 'True'
     axes:
     - axis:
@@ -24,6 +29,9 @@
         type: yaml
         name: KUBERNETES_VERSION
         filename: helpers/matrix.yml
+    wrappers:
+    - build-name:
+        name: "${BUILD_NUMBER} - ${BRANCH} - ${BUILD_ID}"
     builders:
     - shell: |-
         #!/usr/local/bin/runbld
diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-logstash.yml b/.ci/jobs/elastic+helm-charts+staging+integration-logstash.yml
index 01fcefe23..17b2d635d 100644
--- a/.ci/jobs/elastic+helm-charts+staging+integration-logstash.yml
+++ b/.ci/jobs/elastic+helm-charts+staging+integration-logstash.yml
@@ -6,9 +6,14 @@
     parameters:
       - string:
           name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
+          description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)"
+      - string:
+          name: BRANCH
+          description: "The helm-charts repo branch to use. (Example: 7.8)"
     scm:
     - git:
+        branches:
+        - $BRANCH
         wipe-workspace: 'True'
     axes:
     - axis:
@@ -24,6 +29,9 @@
         type: yaml
         name: KUBERNETES_VERSION
         filename: helpers/matrix.yml
+    wrappers:
+    - build-name:
+        name: "${BUILD_NUMBER} - ${BRANCH} - ${BUILD_ID}"
     builders:
     - shell: |-
         #!/usr/local/bin/runbld
diff --git a/.ci/jobs/elastic+helm-charts+staging+integration-metricbeat.yml b/.ci/jobs/elastic+helm-charts+staging+integration-metricbeat.yml
index 940a06e3d..f54c6c786 100644
--- a/.ci/jobs/elastic+helm-charts+staging+integration-metricbeat.yml
+++ b/.ci/jobs/elastic+helm-charts+staging+integration-metricbeat.yml
@@ -6,9 +6,14 @@
     parameters:
       - string:
           name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
+          description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)"
+      - string:
+          name: BRANCH
+          description: "The helm-charts repo branch to use. (Example: 7.8)"
     scm:
     - git:
+        branches:
+        - $BRANCH
         wipe-workspace: 'True'
     axes:
     - axis:
@@ -24,6 +29,9 @@
         type: yaml
         name: KUBERNETES_VERSION
         filename: helpers/matrix.yml
+    wrappers:
+    - build-name:
+        name: "${BUILD_NUMBER} - ${BRANCH} - ${BUILD_ID}"
     builders:
     - shell: |-
         #!/usr/local/bin/runbld
diff --git a/.ci/jobs/elastic+helm-charts+staging.yml b/.ci/jobs/elastic+helm-charts+staging.yml
index 0c0b8efcf..2acf646c2 100644
--- a/.ci/jobs/elastic+helm-charts+staging.yml
+++ b/.ci/jobs/elastic+helm-charts+staging.yml
@@ -7,11 +7,19 @@
     parameters:
       - string:
           name: BUILD_ID
-          description: "The buildId for the staging images. (Example: 7.6.1-abcdabcd)"
+          description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)"
+      - string:
+          name: BRANCH
+          description: "The helm-charts repo branch to use. (Example: 7.8)"
     project-type: multijob
     scm:
     - git:
+        branches:
+        - $BRANCH
         wipe-workspace: 'False'
+    wrappers:
+    - build-name:
+        name: "${BUILD_NUMBER} - ${BRANCH} - ${BUILD_ID}"
     builders:
     - multijob:
         name: template testing and kubernetes cluster creation