Update testing to test agains Snapshot Logstash version#30742
Update testing to test agains Snapshot Logstash version#30742ruflin merged 1 commit intoelastic:mainfrom
Conversation
In elastic#15568 the testing of Logstash was changed to a specific hash because of some temporary issues with Logstash. Instead testing should happen against the SNAPSHOT releases like for Elasticsearch and Kibana.
|
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
|
This pull request does not have a backport label. Could you fix it @ruflin? 🙏
NOTE: |
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
💚 Flaky test reportTests succeeded. 🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
|
@v1v I assume from here on LS should be updated again with the script that also updates KB and ES. |
I think so, https://github.com/elastic/beats/blob/main/.ci/bump-stack-version.sh#L33 is the one in charge I just verified and it did work like a charm:
diff --git a/.ci/bump-stack-version.sh b/.ci/bump-stack-version.sh
index 567b10bbba7..eac19c89049 100755
--- a/.ci/bump-stack-version.sh
+++ b/.ci/bump-stack-version.sh
@@ -43,6 +43,8 @@ fi
for FILE in ${FILES} ; do
git add $FILE
done
+
+exit 0
git diff --staged --quiet || git commit -m "[Automation] Update elastic stack version to ${VERSION} for testing"
git --no-pager log -1
diff --git a/testing/environments/snapshot-oss.yml b/testing/environments/snapshot-oss.yml
index c4455ffdbae..2065a82482d 100644
--- a/testing/environments/snapshot-oss.yml
+++ b/testing/environments/snapshot-oss.yml
@@ -3,7 +3,7 @@
version: '2.3'
services:
elasticsearch:
- image: docker.elastic.co/elasticsearch/elasticsearch:8.2.0-a12f7069-SNAPSHOT
+ image: docker.elastic.co/elasticsearch/elasticsearch:8.2.0-abcdefgh-SNAPSHOT
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
retries: 300
@@ -21,7 +21,7 @@ services:
- "script.context.template.cache_max_size=2000"
logstash:
- image: docker.elastic.co/logstash/logstash-oss:8.2.0-a12f7069-SNAPSHOT
+ image: docker.elastic.co/logstash/logstash-oss:8.2.0-abcdefgh-SNAPSHOT
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
retries: 600
@@ -31,7 +31,7 @@ services:
- ./docker/logstash/pki:/etc/pki:ro
kibana:
- image: docker.elastic.co/kibana/kibana:8.2.0-a12f7069-SNAPSHOT
+ image: docker.elastic.co/kibana/kibana:8.2.0-abcdefgh-SNAPSHOT
healthcheck:
test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
retries: 600
diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml
index 45f804375c9..9cf6f3fc5c2 100644
--- a/testing/environments/snapshot.yml
+++ b/testing/environments/snapshot.yml
@@ -3,7 +3,7 @@
version: '2.3'
services:
elasticsearch:
- image: docker.elastic.co/elasticsearch/elasticsearch:8.2.0-a12f7069-SNAPSHOT
+ image: docker.elastic.co/elasticsearch/elasticsearch:8.2.0-abcdefgh-SNAPSHOT
# When extend is used it merges healthcheck.tests, see:
# https://github.com/docker/compose/issues/8962
# healthcheck:
@@ -32,7 +32,7 @@ services:
- "./docker/elasticsearch/users_roles:/usr/share/elasticsearch/config/users_roles"
logstash:
- image: docker.elastic.co/logstash/logstash:8.2.0-a12f7069-SNAPSHOT
+ image: docker.elastic.co/logstash/logstash:8.2.0-abcdefgh-SNAPSHOT
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
retries: 600
@@ -42,7 +42,7 @@ services:
- ./docker/logstash/pki:/etc/pki:ro
kibana:
- image: docker.elastic.co/kibana/kibana:8.2.0-a12f7069-SNAPSHOT
+ image: docker.elastic.co/kibana/kibana:8.2.0-abcdefgh-SNAPSHOT
environment:
- "ELASTICSEARCH_USERNAME=kibana_system_user"
- "ELASTICSEARCH_PASSWORD=testing"
`` |
In #15568 the testing of Logstash was changed to a specific hash because of some temporary issues with Logstash. Instead testing should happen against the SNAPSHOT releases like for Elasticsearch and Kibana.