Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 26, 2025

A better proposal then 75bef16 commit:

diff --git a/.ci/logstash-run.sh b/.ci/logstash-run.sh
index 23f92042a..22e4ea622 100755
--- a/.ci/logstash-run.sh
+++ b/.ci/logstash-run.sh
@@ -27,6 +27,7 @@ bundle exec rake prepare_geoip_resources
 
 if [[ "$INTEGRATION" != "true" ]]; then
   bundle exec rspec --format=documentation spec/unit --tag ~integration --tag ~secure_integration
+  bundle exec rake java_test
 else
 
   if [[ "$SECURE_INTEGRATION" == "true" ]]; then
diff --git a/Rakefile b/Rakefile
index 58824d84a..710bd50ad 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,19 +1,13 @@
 require 'logstash/devutils/rake'
 
-task :install_jars do
+task :vendor do
   sh('./gradlew clean vendor')
 end
+
 task :prepare_geoip_resources do
   sh('./gradlew geoipTestResources')
 end
 
-task :vendor => :install_jars
-
-task :test do
-  require 'rspec'
-  require 'rspec/core/runner'
-  Rake::Task[:install_jars].invoke
-  Rake::Task[:generate_ssl].invoke
-  sh './gradlew test'
-  exit(RSpec::Core::Runner.run(Rake::FileList['spec/**/*_spec.rb']))
+task :java_test do
+  sh('./gradlew test')
 end
\ No newline at end of file

```<hr>This is an automatic backport of pull request #306 done by [Mergify](https://mergify.com).

* Run Java tests in unit test CIs.

(cherry picked from commit f190c72)
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 26, 2025

Copy link
Collaborator

@mashhurs mashhurs left a comment

Choose a reason for hiding this comment

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

clean backport!
CI failure, 9.0.4 snapshot isn't available.

@mashhurs mashhurs merged commit c21b0c9 into 9.1 Jun 26, 2025
4 of 5 checks passed
@mashhurs mashhurs deleted the mergify/bp/9.1/pr-306 branch June 26, 2025 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants