Skip to content

Commit 049e085

Browse files
committed
[CI] Make security task dependent on elasticsearch:update task
1 parent 765fbf2 commit 049e085

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

.ci/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ RUN gem install bundler
1616
RUN bundle install
1717
RUN bundle exec rake bundle:clean
1818
RUN rake bundle:install
19-
RUN bundle exec rake setup
20-
RUN bundle exec rake elasticsearch:update

rake_tasks/elasticsearch_tasks.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace :elasticsearch do
3636
end
3737

3838
desc "Update the submodule with Elasticsearch core repository"
39-
task :update do
39+
task :update => :setup do
4040
sh "git --git-dir=#{CURRENT_PATH.join('tmp/elasticsearch/.git')} --work-tree=#{CURRENT_PATH.join('tmp/elasticsearch')} fetch origin --quiet"
4141
begin
4242
%x[git --git-dir=#{CURRENT_PATH.join('tmp/elasticsearch/.git')} --work-tree=#{CURRENT_PATH.join('tmp/elasticsearch')} pull]

rake_tasks/test_tasks.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace :test do
3838
end
3939

4040
desc "Run security (Platinum) rest api yaml tests"
41-
task :security do
41+
task :security => 'elasticsearch:update' do
4242
Rake::Task['elasticsearch:wait_for_green'].invoke
4343
Rake::Task['elasticsearch:checkout_build'].invoke
4444
puts '-' * 80

0 commit comments

Comments
 (0)