Skip to content

Commit

Permalink
Update Stack version to 8.6.0 (#6327)
Browse files Browse the repository at this point in the history
- Update recipes/samples manifests and Helm charts to use Stack version `8.6.0` (`hack/update-stack-version.sh 8\.5\.0 8.6.0`)
- Update latest `7.17.x` and `8.x` in test framework
- Add `8.5.3` and `8.7.0-SNAPSHOT` to the e2e-tests pipelines
  • Loading branch information
thbkrkr committed Jan 19, 2023
1 parent f8b6819 commit 7eb6706
Show file tree
Hide file tree
Showing 57 changed files with 166 additions and 143 deletions.
4 changes: 2 additions & 2 deletions .ci/pipelines/e2e-tests-snapshot-versions-gke.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ pipeline {
)}"""
}
parallel {
stage("8.6.0-SNAPSHOT") {
stage("8.7.0-SNAPSHOT") {
agent {
label 'linux'
}
steps {
unstash "source"
script {
runWith(lib, failedTests, "eck-8x-snapshot-${BUILD_NUMBER}-e2e", "8.6.0-SNAPSHOT")
runWith(lib, failedTests, "eck-8x-snapshot-${BUILD_NUMBER}-e2e", "8.7.0-SNAPSHOT")
}
}
}
Expand Down
54 changes: 33 additions & 21 deletions .ci/pipelines/e2e-tests-stack-versions-gke.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ pipeline {
runWith(lib, failedTests, "eck-713-${BUILD_NUMBER}-e2e", "7.13.4")
}
}
}
stage("7.14.x") {
}
stage("7.14.x") {
agent {
label 'linux'
}
Expand All @@ -67,8 +67,8 @@ pipeline {
runWith(lib, failedTests, "eck-714-${BUILD_NUMBER}-e2e", "7.14.2")
}
}
}
stage("7.15.x") {
}
stage("7.15.x") {
agent {
label 'linux'
}
Expand All @@ -78,8 +78,8 @@ pipeline {
runWith(lib, failedTests, "eck-715-${BUILD_NUMBER}-e2e", "7.15.2")
}
}
}
stage("7.16.x") {
}
stage("7.16.x") {
agent {
label 'linux'
}
Expand All @@ -89,19 +89,19 @@ pipeline {
runWith(lib, failedTests, "eck-716-${BUILD_NUMBER}-e2e", "7.16.3")
}
}
}
stage("7.17.x") {
}
stage("7.17.x") {
agent {
label 'linux'
}
steps {
unstash "source"
script {
runWith(lib, failedTests, "eck-717-${BUILD_NUMBER}-e2e", "7.17.6")
runWith(lib, failedTests, "eck-717-${BUILD_NUMBER}-e2e", "7.17.8")
}
}
}
stage("8.0.x") {
}
stage("8.0.x") {
agent {
label 'linux'
}
Expand All @@ -111,8 +111,8 @@ pipeline {
runWith(lib, failedTests, "eck-80-${BUILD_NUMBER}-e2e", "8.0.1")
}
}
}
stage("8.1.x") {
}
stage("8.1.x") {
agent {
label 'linux'
}
Expand All @@ -122,8 +122,8 @@ pipeline {
runWith(lib, failedTests, "eck-81-${BUILD_NUMBER}-e2e", "8.1.3")
}
}
}
stage("8.2.x") {
}
stage("8.2.x") {
agent {
label 'linux'
}
Expand All @@ -133,8 +133,8 @@ pipeline {
runWith(lib, failedTests, "eck-82-${BUILD_NUMBER}-e2e", "8.2.3")
}
}
}
stage("8.3.x") {
}
stage("8.3.x") {
agent {
label 'linux'
}
Expand All @@ -144,8 +144,8 @@ pipeline {
runWith(lib, failedTests, "eck-83-${BUILD_NUMBER}-e2e", "8.3.3")
}
}
}
stage("8.4.x") {
}
stage("8.4.x") {
agent {
label 'linux'
}
Expand All @@ -155,7 +155,18 @@ pipeline {
runWith(lib, failedTests, "eck-84-${BUILD_NUMBER}-e2e", "8.4.3")
}
}
}
}
stage("8.5.x") {
agent {
label 'linux'
}
steps {
unstash "source"
script {
runWith(lib, failedTests, "eck-85-${BUILD_NUMBER}-e2e", "8.5.3")
}
}
}
}
}
}
Expand Down Expand Up @@ -195,7 +206,8 @@ pipeline {
"eck-81-${BUILD_NUMBER}-e2e",
"eck-82-${BUILD_NUMBER}-e2e",
"eck-83-${BUILD_NUMBER}-e2e",
"eck-84-${BUILD_NUMBER}-e2e"
"eck-84-${BUILD_NUMBER}-e2e",
"eck-85-${BUILD_NUMBER}-e2e"
]
for (int i = 0; i < clusters.size(); i++) {
build job: 'cloud-on-k8s-e2e-cleanup',
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ E2E_REGISTRY_NAMESPACE ?= eck-dev

E2E_IMG_TAG := $(IMG_VERSION)
E2E_IMG ?= $(REGISTRY)/$(E2E_REGISTRY_NAMESPACE)/eck-e2e-tests:$(E2E_IMG_TAG)
E2E_STACK_VERSION ?= 8.5.0
E2E_STACK_VERSION ?= 8.6.0
export TESTS_MATCH ?= "^Test" # can be overriden to eg. TESTS_MATCH=TestMutationMoreNodes to match a single test
export E2E_JSON ?= false
TEST_TIMEOUT ?= 30m
Expand Down
2 changes: 1 addition & 1 deletion config/e2e/monitoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ spec:
meta:
package:
name: system
version: 8.5.0
version: 8.6.0
data_stream:
namespace: default
processors:
Expand Down
2 changes: 1 addition & 1 deletion config/recipes/apm-server-jaeger/apm-server-jaeger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: apm-server-quickstart
namespace: default
spec:
version: 8.5.0
version: 8.6.0
count: 1
config:
name: elastic-apm
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/associations-rbac/apm_es_kibana_rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ metadata:
name: elasticsearch-sample
namespace: elasticsearch-ns
spec:
version: 8.5.0
version: 8.6.0
nodeSets:
- name: default
count: 1
Expand All @@ -97,7 +97,7 @@ metadata:
name: kibana-sample
namespace: kibana-ns
spec:
version: 8.5.0
version: 8.6.0
count: 1
config:
xpack.fleet.packages:
Expand All @@ -115,7 +115,7 @@ metadata:
name: apm-apm-sample
namespace: apmserver-ns
spec:
version: 8.5.0
version: 8.6.0
count: 1
elasticsearchRef:
name: "elasticsearch-sample"
Expand Down
2 changes: 1 addition & 1 deletion config/recipes/autoscaling/elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch-sample
spec:
version: 8.5.0
version: 8.6.0
nodeSets:
- name: master
count: 3
Expand Down
8 changes: 4 additions & 4 deletions config/recipes/beats/auditbeat_hosts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: auditbeat
spec:
type: auditbeat
version: 8.5.0
version: 8.6.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
# path: /run
#initContainers:
#- name: cos-init
# image: docker.elastic.co/beats/auditbeat:8.5.0
# image: docker.elastic.co/beats/auditbeat:8.6.0
# volumeMounts:
# - name: run
# mountPath: /run
Expand Down Expand Up @@ -118,7 +118,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.5.0
version: 8.6.0
nodeSets:
- name: default
count: 3
Expand All @@ -130,7 +130,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.5.0
version: 8.6.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/filebeat_autodiscover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: filebeat
spec:
type: filebeat
version: 8.5.0
version: 8.6.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -100,7 +100,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.5.0
version: 8.6.0
nodeSets:
- name: default
count: 3
Expand All @@ -112,7 +112,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.5.0
version: 8.6.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/filebeat_autodiscover_by_metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: filebeat
spec:
type: filebeat
version: 8.5.0
version: 8.6.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -102,7 +102,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.5.0
version: 8.6.0
nodeSets:
- name: default
count: 3
Expand All @@ -114,7 +114,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.5.0
version: 8.6.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/filebeat_no_autodiscover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: filebeat
spec:
type: filebeat
version: 8.5.0
version: 8.6.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -53,7 +53,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.5.0
version: 8.6.0
nodeSets:
- name: default
count: 3
Expand All @@ -65,7 +65,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.5.0
version: 8.6.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/heartbeat_es_kb_health.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: heartbeat
spec:
type: heartbeat
version: 8.5.0
version: 8.6.0
elasticsearchRef:
name: elasticsearch
config:
Expand All @@ -27,7 +27,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.5.0
version: 8.6.0
nodeSets:
- name: default
count: 3
Expand All @@ -39,7 +39,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.5.0
version: 8.6.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/metricbeat_hosts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: metricbeat
spec:
type: metricbeat
version: 8.5.0
version: 8.6.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -174,7 +174,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.5.0
version: 8.6.0
nodeSets:
- name: default
count: 3
Expand All @@ -186,7 +186,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.5.0
version: 8.6.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
Loading

0 comments on commit 7eb6706

Please sign in to comment.