Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

[release] Initiate 7.7 branch #541

Merged
merged 21 commits into from
Apr 9, 2020
Merged

[release] Initiate 7.7 branch #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c489e20
Make use of secure port when accessing Kubelet API
ChrsMark Feb 5, 2020
1e83690
Update values.yaml
ChrsMark Feb 5, 2020
e3848b6
Update values.yaml
ChrsMark Feb 5, 2020
51867fc
Remove CHANGELOG to keep it only on master
mgreau Mar 25, 2020
1a55b3e
[jenkins] Use generic way for generating jobs per branch
mgreau Mar 25, 2020
c05ed6d
[7.7] Resources/Versions dedicated to 7.7.x dev/release versions
mgreau Mar 25, 2020
835df79
Merge remote-tracking branch 'upstream/master' into patch-2
ChrsMark Apr 2, 2020
0826c89
The status number does not contains the snapshot value
mgreau Apr 2, 2020
0d051f4
Do not update release version notice
mgreau Apr 2, 2020
df16e23
[tests] Remove SNAPSHOT values in goss files
mgreau Apr 2, 2020
42f0d66
Fix es test
mgreau Apr 3, 2020
3b2f3ef
Replace HOSTNAME with NODE_NAME to access host without hostNetwork
ChrsMark Apr 3, 2020
2aed960
Add nodes/stats clusterRoleRules
ChrsMark Apr 3, 2020
a03b78e
Merge pull request #471 from ChrsMark/patch-2
jmlrt Apr 3, 2020
a098304
[tests] ES outputs the SNAPSHOT version
mgreau Apr 3, 2020
48589e8
[elasticsearch] fix helm test command
jmlrt Apr 6, 2020
fe92c10
Merge pull request #564 from jmlrt/fix-helm-test
jmlrt Apr 6, 2020
bbdc027
Merge branch 'master' into dev-branch-for-77
mgreau Apr 7, 2020
57683a5
[doc] Update APM Server doc with branching model
mgreau Apr 9, 2020
1e8b48f
Update doc
mgreau Apr 9, 2020
412fe3b
[doc] Update instructions related to the branching model
mgreau Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .ci/jobs/defaults.yml → .ci/jobs.t/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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: git@github.com:elastic/helm-charts.git
basedir: ''
wipe-workspace: 'True'
Expand Down
6 changes: 3 additions & 3 deletions ...ic+helm-charts+master+cluster-cleanup.yml → ...+helm-charts+{branch}+cluster-cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions ...c+helm-charts+master+cluster-creation.yml → ...helm-charts+{branch}+cluster-creation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions ...-charts+master+integration-apm-server.yml → ...harts+{branch}+integration-apm-server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions ...arts+master+integration-elasticsearch.yml → ...ts+{branch}+integration-elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions ...lm-charts+master+integration-filebeat.yml → ...-charts+{branch}+integration-filebeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions ...helm-charts+master+integration-kibana.yml → ...lm-charts+{branch}+integration-kibana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions ...lm-charts+master+integration-logstash.yml → ...-charts+{branch}+integration-logstash.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions ...-charts+master+integration-metricbeat.yml → ...harts+{branch}+integration-metricbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion ...c+helm-charts+staging+cluster-cleanup.yml → ...arts+{branch}+staging+cluster-cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- job:
name: elastic+helm-charts+staging+cluster-cleanup
name: elastic+helm-charts+%BRANCH%+staging+cluster-cleanup
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Staging jobs where created by #532 to tests staging Docker image. IMHO these jobs should stay only on master branch.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this config we should automatically have staging jobs generated per git branch. Those "template" files will be present on all git branches (without needed to update them)

display-name: elastic / helm-charts - staging - cluster cleanup
description: staging - cluster cleanup
parameters:
Expand Down
2 changes: 1 addition & 1 deletion ...+helm-charts+staging+cluster-creation.yml → ...rts+{branch}+staging+cluster-creation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- job:
name: elastic+helm-charts+staging+cluster-creation
name: elastic+helm-charts+%BRANCH%+staging+cluster-creation
display-name: elastic / helm-charts - staging - cluster creation
description: staging - cluster creation
parameters:
Expand Down
2 changes: 1 addition & 1 deletion ...charts+staging+integration-apm-server.yml → ...ranch}+staging+integration-apm-server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- job:
name: elastic+helm-charts+staging+integration-apm-server
name: elastic+helm-charts+%BRANCH%+staging+integration-apm-server
display-name: elastic / helm-charts - staging - integration apm-server
description: staging - integration apm-server
parameters:
Expand Down
2 changes: 1 addition & 1 deletion ...rts+staging+integration-elasticsearch.yml → ...ch}+staging+integration-elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- job:
name: elastic+helm-charts+staging+integration-elasticsearch
name: elastic+helm-charts+%BRANCH%+staging+integration-elasticsearch
display-name: elastic / helm-charts - staging - integration elasticsearch
description: staging - integration elasticsearch
parameters:
Expand Down
2 changes: 1 addition & 1 deletion ...m-charts+staging+integration-filebeat.yml → ...{branch}+staging+integration-filebeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- job:
name: elastic+helm-charts+staging+integration-filebeat
name: elastic+helm-charts+%BRANCH%+staging+integration-filebeat
display-name: elastic / helm-charts - staging - integration filebeat
description: staging - integration filebeat
parameters:
Expand Down
2 changes: 1 addition & 1 deletion ...elm-charts+staging+integration-kibana.yml → ...s+{branch}+staging+integration-kibana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- job:
name: elastic+helm-charts+staging+integration-kibana
name: elastic+helm-charts+%BRANCH%+staging+integration-kibana
display-name: elastic / helm-charts - staging - integration kibana
description: staging - integration kibana
parameters:
Expand Down
2 changes: 1 addition & 1 deletion ...m-charts+staging+integration-logstash.yml → ...{branch}+staging+integration-logstash.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- job:
name: elastic+helm-charts+staging+integration-logstash
name: elastic+helm-charts+%BRANCH%+staging+integration-logstash
display-name: elastic / helm-charts - staging - integration logstash
description: staging - integration logstash
parameters:
Expand Down
2 changes: 1 addition & 1 deletion ...charts+staging+integration-metricbeat.yml → ...ranch}+staging+integration-metricbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- job:
name: elastic+helm-charts+staging+integration-metricbeat
name: elastic+helm-charts+%BRANCH%+staging+integration-metricbeat
display-name: elastic / helm-charts - staging - integration metricbeat
description: staging - integration metricbeat
parameters:
Expand Down
2 changes: 1 addition & 1 deletion .ci/jobs/elastic+helm-charts+staging.yml → .../elastic+helm-charts+{branch}+staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- job:
name: elastic+helm-charts+staging
name: elastic+helm-charts+%BRANCH%+staging
display-name: elastic / helm-charts - staging
description: Staging image testing
concurrent: true
Expand Down
6 changes: 3 additions & 3 deletions ...lm-charts+master+template-lint-python.yml → ...-charts+{branch}+template-lint-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions ...c+helm-charts+master+template-testing.yml → ...helm-charts+{branch}+template-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
26 changes: 13 additions & 13 deletions .ci/jobs/elastic+helm-charts+master.yml → .ci/jobs.t/elastic+helm-charts+{branch}.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
- job:
name: elastic+helm-charts+master
display-name: elastic / helm-charts - master
description: Master branch testing
name: elastic+helm-charts+%BRANCH%
display-name: elastic / helm-charts - %BRANCH%
description: branch testing
project-type: multijob
scm:
- git:
Expand All @@ -15,34 +15,34 @@
name: template testing and kubernetes cluster creation
condition: SUCCESSFUL
projects:
- name: elastic+helm-charts+master+template-testing
- name: elastic+helm-charts+%BRANCH%+template-testing
current-parameters: true
- name: elastic+helm-charts+master+lint-python
- name: elastic+helm-charts+%BRANCH%+lint-python
current-parameters: true
- name: elastic+helm-charts+master+cluster-creation
- name: elastic+helm-charts+%BRANCH%+cluster-creation
current-parameters: true
- multijob:
name: elasticsearch integration testing
condition: ALWAYS
projects:
- name: elastic+helm-charts+master+integration-elasticsearch
- name: elastic+helm-charts+%BRANCH%+integration-elasticsearch
current-parameters: true
- multijob:
name: integration testing
condition: ALWAYS
projects:
- name: elastic+helm-charts+master+integration-kibana
- name: elastic+helm-charts+%BRANCH%+integration-kibana
current-parameters: true
- name: elastic+helm-charts+master+integration-filebeat
- name: elastic+helm-charts+%BRANCH%+integration-filebeat
current-parameters: true
- name: elastic+helm-charts+master+integration-metricbeat
- name: elastic+helm-charts+%BRANCH%+integration-metricbeat
current-parameters: true
- name: elastic+helm-charts+master+integration-logstash
- name: elastic+helm-charts+%BRANCH%+integration-logstash
current-parameters: true
- name: elastic+helm-charts+master+integration-apm-server
- name: elastic+helm-charts+%BRANCH%+integration-apm-server
current-parameters: true
publishers:
- trigger-parameterized-builds:
- project: elastic+helm-charts+master+cluster-cleanup
- project: elastic+helm-charts+%BRANCH%+cluster-cleanup
current-parameters: true
trigger-with-no-params: false
35 changes: 0 additions & 35 deletions .ci/jobs/elastic+helm-charts+pull-request+cluster-cleanup.yml
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions .ci/jobs/elastic+helm-charts+pull-request+cluster-creation.yml
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions .ci/jobs/elastic+helm-charts+pull-request+integration-apm-server.yml
View file
Open in desktop

This file was deleted.

Loading