Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update testing to test agains Snapshot Logstash version #30742

Merged
merged 1 commit into from
Mar 9, 2022

Conversation

ruflin
Copy link
Member

@ruflin ruflin commented Mar 9, 2022

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.

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.
@ruflin ruflin added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Mar 9, 2022
@ruflin ruflin self-assigned this Mar 9, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Mar 9, 2022
@mergify
Copy link
Contributor

mergify bot commented Mar 9, 2022

This pull request does not have a backport label. Could you fix it @ruflin? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Mar 9, 2022
@jlind23 jlind23 requested a review from a team March 9, 2022 09:01
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview [preview](https://ci-stats.elastic.co/app/apm/services/beats-ci/transactions/view?rangeFrom=2022-03-09T08:22:22.889Z&rangeTo=2022-03-09T08:42:22.889Z&transactionName=BUILD Beats/beats/PR-{number}&transactionType=job&latencyAggregationType=avg&traceId=1e456d746c9cdc6b5c01766d137ba92d&transactionId=6cf4d268aea810b6)

Expand to view the summary

Build stats

  • Start Time: 2022-03-09T08:32:22.889+0000

  • Duration: 110 min 51 sec

Test stats 🧪

Test Results
Failed 0
Passed 43000
Skipped 3846
Total 46846

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@ruflin ruflin merged commit 9e6536d into elastic:main Mar 9, 2022
@ruflin
Copy link
Member Author

ruflin commented Mar 9, 2022

@v1v I assume from here on LS should be updated again with the script that also updates KB and ES.

@ruflin ruflin deleted the logstash-snapshot-testing branch March 9, 2022 10:34
@v1v
Copy link
Member

v1v commented Mar 9, 2022

@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:

.ci/bump-stack-version.sh 8.2.0-abcdefgh false produced:

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"
``

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip Skip notification from the automated backport with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants