Removing OpenDistro tests (#142)

* Removing ODFE tests Signed-off-by: Vacha Shah <[email protected]> * Addressing comments Signed-off-by: Vacha Shah <[email protected]> * Fixing lint workflow Signed-off-by: Vacha Shah <[email protected]> Signed-off-by: Vacha Shah <[email protected]>
opensearch-project · Oct 28, 2022 · da225ec · da225ec
1 parent cd6193e
commit da225ec
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 60 deletions.
diff --git a/.ci/opendistro/Dockerfile.opendistro b/.ci/opendistro/Dockerfile.opendistro
diff --git a/.ci/opendistro/docker-compose.yml b/.ci/opendistro/docker-compose.yml
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,7 +20,7 @@ jobs:
         with: { fetch-depth: 1 }
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.16.2
+          go-version: 1.17
       - name: Install dependencies
         run: go get -u golang.org/x/lint/golint
         env:

diff --git a/.github/workflows/test-compatibility.yml b/.github/workflows/test-compatibility.yml
@@ -45,7 +45,7 @@ jobs:
         run: |
           export OPENSEARCH_VERSION=${{ matrix.entry.opensearch_version }}
           export SECURE_INTEGRATION=${{ matrix.secured }}
-          make cluster.clean cluster.opensearch.build cluster.opensearch.start
+          make cluster.clean cluster.build cluster.start
 
       - name: Integration test without security
         if: ${{ matrix.secured == 'false'}}
@@ -57,4 +57,4 @@ jobs:
 
       - name: Stop the OpenSearch cluster
         run: |
-          make cluster.opensearch.stop
+          make cluster.stop
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -15,9 +15,6 @@ jobs:
   test:
     name: Tests
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        cluster: [ "opendistro" , "opensearch" ]
     steps:
       - uses: actions/checkout@v2
         with: { fetch-depth: 1 }
@@ -30,9 +27,9 @@ jobs:
           sudo sysctl -w vm.swappiness=1
           sudo sysctl -w fs.file-max=262144
           sudo sysctl -w vm.max_map_count=262144
-      - name: Launch ${{ matrix.cluster }} cluster
+      - name: Launch OpenSearch cluster
         run: |
-          make cluster.clean cluster.${{ matrix.cluster }}.build cluster.${{ matrix.cluster }}.start
+          make cluster.clean cluster.build cluster.start
       - run: make test-integ race=true
       - uses: codecov/codecov-action@v1
         with:
@@ -45,9 +42,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       SECURE_INTEGRATION: true
-    strategy:
-      matrix:
-        cluster: [ "opendistro" , "opensearch" ]
     steps:
       - uses: actions/checkout@v2
         with: { fetch-depth: 1 }
@@ -60,7 +54,7 @@ jobs:
           sudo sysctl -w vm.swappiness=1
           sudo sysctl -w fs.file-max=262144
           sudo sysctl -w vm.max_map_count=262144
-      - name: Launch ${{ matrix.cluster }} cluster
+      - name: Launch OpenSearch cluster
         run: |
-          make cluster.clean cluster.${{ matrix.cluster }}.build cluster.${{ matrix.cluster }}.start
+          make cluster.clean cluster.build cluster.start
       - run: make test-integ-secure
diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
@@ -53,15 +53,15 @@ Hence, create all integration tests with build tag 'integration'.
 #### Execute integration tests from your terminal
 1. Run below command to start containers. By default, it will launch latest OpenSearch cluster.
    ```
-   make cluster.opensearch.build cluster.opensearch.start
+   make cluster.build cluster.start
    ```
 2. Run all integration tests.
    ```
    make test-integ race=true
    ```
 3. Stop and clean containers.
    ```
-   make cluster.opensearch.stop cluster.clean
+   make cluster.stop cluster.clean
    ```
 ## Use an Editor
 

diff --git a/Makefile b/Makefile
@@ -152,24 +152,14 @@ godoc: ## Display documentation for the package
 	@printf "\n"
 	godoc --http=localhost:6060 --play
 
-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.opensearch.build:
+cluster.build:
 	docker-compose --project-directory .ci/opensearch build;
 
-cluster.opensearch.start:
+cluster.start:
 	docker-compose --project-directory .ci/opensearch up -d ;
 	sleep 20;
 
-cluster.opensearch.stop:
+cluster.stop:
 	docker-compose --project-directory .ci/opensearch down ;
 
 
@@ -193,14 +183,10 @@ workflow: ## Run all github workflow commands here sequentially
 # 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
 ### OpenSearch
-	make cluster.clean cluster.opensearch.build cluster.opensearch.start
+	make cluster.clean cluster.build cluster.start
 	make test-integ race=true
-	make cluster.opensearch.stop
+	make cluster.stop
 
 ##@ Other
 #------------------------------------------------------------------------------
@@ -209,4 +195,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 linters linters.install
+.PHONY: help backport cluster cluster.clean coverage  godoc lint release test test-bench test-integ test-unit linters linters.install