Removing OpenDistro integration tests (opensearch-project#271)

Signed-off-by: Miki <miki@amazon.com>
AMoo-Miki · Jul 12, 2023 · f6e4661 · f6e4661
1 parent ad2be2e
commit f6e4661
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 70 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/integration.yml b/.github/workflows/integration.yml
@@ -1,14 +1,6 @@
 name: Integration
-# trigger on every commit push and PR for all branches
-on:
-  push:
-    branches: ['**']
-    paths-ignore:
-      - '**/*.md'
-  pull_request:
-    branches: ['**']
-    paths-ignore:
-      - '**/*.md'
+
+on: [push, pull_request]
 
 jobs:
   helpers-integration-test:
@@ -17,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 16.x, 18.x]
+        node-version: [10.x, 12.x, 14.x, 16.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -34,21 +26,10 @@ jobs:
           make cluster.clean cluster.opensearch.build cluster.opensearch.start
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
 
-      # NPM started understanding yarn.lock file starting from v7
-      - name: Update NPM
-        shell: bash
-        run: |
-          export NPM_VERSION=$(npm -v)
-          export IS_NPM_SUITABLE=$(node -p "parseInt(process.env.NPM_ROOT, 10) >= 7")
-          if [ "$IS_NPM_SUITABLE" == "false" ]; then
-            echo "NPM needs upgrading!"
-            npm i npm@7 -g
-          fi
-
       - name: Install
         run: |
           npm install
@@ -63,7 +44,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 16.x, 18.x]
+        node-version: [10.x, 12.x, 14.x, 16.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -81,21 +62,10 @@ jobs:
           make cluster.clean cluster.opensearch.build cluster.opensearch.start
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
 
-      # NPM started understanding yarn.lock file starting from v7
-      - name: Update NPM
-        shell: bash
-        run: |
-          export NPM_VERSION=$(npm -v)
-          export IS_NPM_SUITABLE=$(node -p "parseInt(process.env.NPM_ROOT, 10) >= 7")
-          if [ "$IS_NPM_SUITABLE" == "false" ]; then
-            echo "NPM needs upgrading!"
-            npm i npm@7 -g
-          fi
-
       - name: Install
         run: |
           npm install

diff --git a/Makefile b/Makefile
@@ -1,13 +1,3 @@
-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:
 	docker-compose --project-directory .ci/opensearch build;
 
@@ -24,4 +14,4 @@ cluster.clean: ## Remove unused Docker volumes and networks
 	docker network prune --force
 	docker system prune --volumes --force
 
-.PHONY: cluster.opendistro.build cluster.opendistro.start cluster.opendistro.stop cluster.opensearch.build cluster.opensearch.start cluster.opensearch.stop cluster.clean
+.PHONY: cluster.opensearch.build cluster.opensearch.start cluster.opensearch.stop cluster.clean