Skip to content

Commit

Permalink
Removing OpenDistro integration tests (#95)
Browse files Browse the repository at this point in the history
Signed-off-by: Vacha Shah <[email protected]>
  • Loading branch information
VachaShah authored Aug 8, 2022
1 parent c90719e commit bc935d0
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 76 deletions.
7 changes: 0 additions & 7 deletions .ci/opendistro/Dockerfile.opendistro

This file was deleted.

17 changes: 0 additions & 17 deletions .ci/opendistro/docker-compose.yml

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,39 +120,3 @@ jobs:
rake bundle:install
- name: opensearch
run: cd opensearch && bundle exec rake test_security:all

test-opendistro:
name: test-opendistro
runs-on: ubuntu-latest
strategy:
matrix:
ruby: [ 2.5, 2.6, 2.7, '3.0', 3.1, jruby-9.3 ]
steps:
- uses: actions/checkout@v2
- name: Increase system limits
run: |
sudo swapoff -a
sudo sysctl -w vm.swappiness=1
sudo sysctl -w fs.file-max=262144
sudo sysctl -w vm.max_map_count=262144
- name: Launch Opendistro cluster
run: |
make cluster.clean cluster.opendistro.build cluster.opendistro.start
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Build and test with Rake
run: |
sudo apt-get update
sudo apt-get install libcurl4-openssl-dev
ruby -v
rake bundle:clean
rake bundle:install
- name: opensearch-ruby
run: cd opensearch && bundle exec rake test:all
- name: opensearch-transport
run: cd opensearch-transport && bundle exec rake test:all
- name: opensearch-api
run: cd opensearch-api && bundle exec rake test:spec
- name: opensearch-dsl
run: cd opensearch-dsl && bundle exec rake test:all
17 changes: 1 addition & 16 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
SHELL := /bin/bash

cluster.opendistro.build:
docker-compose --project-directory .ci/opendistro build;

cluster.opendistro.start:
docker-compose --project-directory .ci/opendistro up -d ;
sleep 20;

cluster.opendistro.stop:
docker-compose --project-directory .ci/opendistro down ;

cluster.clean: ## Remove unused Docker volumes and networks
@printf "\033[2m→ Cleaning up Docker assets...\033[0m\n"
docker volume prune --force
Expand All @@ -29,11 +19,6 @@ workflow: ## Run all github workflow commands here sequentially
make test-unit race=true
# Benchmarks Test
make test-bench
# Integration Test
### OpenDistro
make cluster.clean cluster.opendistro.build cluster.opendistro.start
make test-integ race=true
make cluster.opendistro.stop

##@ Other
#------------------------------------------------------------------------------
Expand All @@ -42,4 +27,4 @@ help: ## Display help
#------------- <https://suva.sh/posts/well-documented-makefiles> --------------

.DEFAULT_GOAL := help
.PHONY: help backport cluster cluster.opendistro.build cluster.opendistro.start cluster.opendistro.stop cluster.clean coverage godoc lint release test test-bench test-integ test-unit
.PHONY: help backport cluster cluster.clean coverage godoc lint release test test-bench test-integ test-unit

0 comments on commit bc935d0

Please sign in to comment.