fix 854 68

.ci/jobs/defaults.yml → .ci/jobs.t/defaults.yml

@@ -12,12 +12,6 @@
     logrotate:
       daysToKeep: 30
       numToKeep: 100
-    parameters:
-    - string:
-        name: branch_specifier
-        default: master
-        description: the Git branch specifier to build (<branchName>, <tagName>,
-          <commitId>, etc.)
     properties:
     - github:
         url: https://github.com/elastic/helm-charts/
@@ -30,7 +24,7 @@
         credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
         reference-repo: /var/lib/jenkins/.git-references/helm-charts.git
         branches:
-        - ${branch_specifier}
+        - "%BRANCH%"
         url: [email protected]:elastic/helm-charts.git
         basedir: ''
         wipe-workspace: 'True'

.ci/jobs/elastic+helm-charts+master+cluster-cleanup.yml → .ci/jobs.t/elastic+helm-charts+{branch}+cluster-cleanup.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+cluster-cleanup
-    display-name: elastic / helm-charts - master - cluster cleanup
-    description: Master - cluster cleanup
+    name: elastic+helm-charts+%BRANCH%+cluster-cleanup
+    display-name: elastic / helm-charts - %BRANCH% - cluster cleanup
+    description: cluster cleanup
     scm:
     - git:
         wipe-workspace: 'True'
@@ -29,7 +29,8 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        BRANCH_NAME="%BRANCH%"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
         cd helpers/terraform/
         ./in-docker make destroy KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}

.ci/jobs/elastic+helm-charts+master+cluster-creation.yml → .ci/jobs.t/elastic+helm-charts+{branch}+cluster-creation.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+cluster-creation
-    display-name: elastic / helm-charts - master - cluster creation
-    description: Master - cluster creation
+    name: elastic+helm-charts+%BRANCH%+cluster-creation
+    display-name: elastic / helm-charts - %BRANCH% - cluster creation
+    description: cluster creation
     scm:
     - git:
         wipe-workspace: 'True'
@@ -29,7 +29,8 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        BRANCH_NAME="%BRANCH%"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
         cd helpers/terraform/
         ./in-docker make up KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}

.ci/jobs/elastic+helm-charts+master+integration-apm-server.yml → .ci/jobs.t/elastic+helm-charts+{branch}+integration-apm-server.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-apm-server
-    display-name: elastic / helm-charts - master - integration apm-server
-    description: Master - integration apm-server
+    name: elastic+helm-charts+%BRANCH%+integration-apm-server
+    display-name: elastic / helm-charts - %BRANCH% - integration apm-server
+    description: integration apm-server
     scm:
     - git:
         wipe-workspace: 'True'
@@ -33,7 +33,8 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        BRANCH_NAME="%BRANCH%"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${APM_SERVER_SUITE} CHART=apm-server

.ci/jobs/elastic+helm-charts+master+integration-elasticsearch.yml → .ci/jobs.t/elastic+helm-charts+{branch}+integration-elasticsearch.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-elasticsearch
-    display-name: elastic / helm-charts - master - integration elasticsearch
-    description: Master - integration elasticsearch
+    name: elastic+helm-charts+%BRANCH%+integration-elasticsearch
+    display-name: elastic / helm-charts - %BRANCH% - integration elasticsearch
+    description: integration elasticsearch
     scm:
     - git:
         wipe-workspace: 'True'
@@ -33,7 +33,8 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        BRANCH_NAME="%BRANCH%"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${ES_SUITE} CHART=elasticsearch

.ci/jobs/elastic+helm-charts+master+integration-filebeat.yml → .ci/jobs.t/elastic+helm-charts+{branch}+integration-filebeat.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-filebeat
-    display-name: elastic / helm-charts - master - integration filebeat
-    description: Master - integration filebeat
+    name: elastic+helm-charts+%BRANCH%+integration-filebeat
+    display-name: elastic / helm-charts - %BRANCH% - integration filebeat
+    description: integration filebeat
     scm:
     - git:
         wipe-workspace: 'True'
@@ -33,7 +33,8 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        BRANCH_NAME="%BRANCH%"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${FILEBEAT_SUITE} CHART=filebeat

.ci/jobs/elastic+helm-charts+master+integration-kibana.yml → .ci/jobs.t/elastic+helm-charts+{branch}+integration-kibana.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-kibana
-    display-name: elastic / helm-charts - master - integration kibana
-    description: Master - integration kibana
+    name: elastic+helm-charts+%BRANCH%+integration-kibana
+    display-name: elastic / helm-charts - %BRANCH% - integration kibana
+    description: integration kibana
     scm:
     - git:
         wipe-workspace: 'True'
@@ -33,7 +33,8 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        BRANCH_NAME="%BRANCH%"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${KIBANA_SUITE} CHART=kibana

.ci/jobs/elastic+helm-charts+master+integration-logstash.yml → .ci/jobs.t/elastic+helm-charts+{branch}+integration-logstash.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-logstash
-    display-name: elastic / helm-charts - master - integration logstash
-    description: Master - integration logstash
+    name: elastic+helm-charts+%BRANCH%+integration-logstash
+    display-name: elastic / helm-charts - %BRANCH% - integration logstash
+    description: integration logstash
     scm:
     - git:
         wipe-workspace: 'True'
@@ -33,7 +33,8 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        BRANCH_NAME="%BRANCH%"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${LOGSTASH_SUITE} CHART=logstash

.ci/jobs/elastic+helm-charts+master+integration-metricbeat.yml → .ci/jobs.t/elastic+helm-charts+{branch}+integration-metricbeat.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-metricbeat
-    display-name: elastic / helm-charts - master - integration metricbeat
-    description: Master - integration metricbeat
+    name: elastic+helm-charts+%BRANCH%+integration-metricbeat
+    display-name: elastic / helm-charts - %BRANCH% - integration metricbeat
+    description: integration metricbeat
     scm:
     - git:
         wipe-workspace: 'True'
@@ -33,7 +33,8 @@
         unset VAULT_ROLE_ID VAULT_SECRET_ID
         set -x
 
-        cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}"
+        BRANCH_NAME="%BRANCH%"
+        cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
         cd helpers/terraform/
         ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${METRICBEAT_SUITE} CHART=metricbeat

.ci/jobs/elastic+helm-charts+master+template-lint-python.yml → .ci/jobs.t/elastic+helm-charts+{branch}+template-lint-python.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+lint-python
-    display-name: elastic / helm-charts - master - lint python
-    description: Master - lint python
+    name: elastic+helm-charts+%BRANCH%+lint-python
+    display-name: elastic / helm-charts - %BRANCH% - lint python
+    description: lint python
     scm:
     - git:
         wipe-workspace: 'True'

.ci/jobs/elastic+helm-charts+master+template-testing.yml → .ci/jobs.t/elastic+helm-charts+{branch}+template-testing.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+template-testing
-    display-name: elastic / helm-charts - master - template testing
-    description: Master - template testing
+    name: elastic+helm-charts+%BRANCH%+template-testing
+    display-name: elastic / helm-charts - %BRANCH% - template testing
+    description: template testing
     scm:
     - git:
         wipe-workspace: 'True'

.ci/jobs.t/elastic+helm-charts+{branch}.yml

@@ -0,0 +1,55 @@
+---
+- job:
+    name: elastic+helm-charts+%BRANCH%
+    display-name: elastic / helm-charts - %BRANCH%
+    description: branch testing
+    project-type: multijob
+    scm:
+    - git:
+        wipe-workspace: 'False'
+    triggers:
+    - timed: H H(02-04) * * *
+    - github
+    builders:
+    - multijob:
+        name: template testing and kubernetes cluster creation
+        condition: SUCCESSFUL
+        projects:
+        - name: elastic+helm-charts+%BRANCH%+template-testing
+          current-parameters: true
+        - name: elastic+helm-charts+%BRANCH%+lint-python
+          current-parameters: true
+        - name: elastic+helm-charts+%BRANCH%+cluster-creation
+          current-parameters: true
+    - multijob:
+        name: elasticsearch integration testing
+        condition: ALWAYS
+        projects:
+        - name: elastic+helm-charts+%BRANCH%+integration-elasticsearch
+          current-parameters: true
+    - multijob:
+        name: integration testing
+        condition: ALWAYS
+        projects:
+        - name: elastic+helm-charts+%BRANCH%+integration-kibana
+          current-parameters: true
+        - name: elastic+helm-charts+%BRANCH%+integration-filebeat
+          current-parameters: true
+        - name: elastic+helm-charts+%BRANCH%+integration-metricbeat
+          current-parameters: true
+        - name: elastic+helm-charts+%BRANCH%+integration-logstash
+          current-parameters: true
+        - name: elastic+helm-charts+%BRANCH%+integration-apm-server
+          current-parameters: true
+    publishers:
+    - trigger-parameterized-builds:
+      - project: elastic+helm-charts+%BRANCH%+cluster-cleanup
+        current-parameters: false
+        trigger-with-no-params: true
+    - slack:
+        notify-back-to-normal: True
+        notify-every-failure: True
+        room: infra-release-notify
+        team-domain: elastic
+        auth-token-id: release-slack-integration-token
+        auth-token-credential-id: release-slack-integration-token