Merge branch 'main' into cypress12

opensearch-project · Aug 15, 2023 · 927820f · 927820f
2 parents d56397c + 14892a0
commit 927820f
Show file tree

Hide file tree

Showing 82 changed files with 7,380 additions and 459 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1,2 @@
-*   @tianleh @kavilla @ohltyler @CCongWang @ashwin-pc @peterzhuamazon
+*   @tianleh @kavilla @ohltyler @CCongWang @ashwin-pc @peterzhuamazon @ananzh @prudhvigodithi
+*   @xluo-aws @Hailong-am @SuZhou-Joe @ruanyl @wanglam @raintygao
diff --git a/.github/workflows/cypress-workflow-plugins-bundle-snapshot-based.yml.disabled b/.github/workflows/cypress-workflow-plugins-bundle-snapshot-based.yml.disabled
diff --git a/.github/workflows/cypress-workflow-vanilla-snapshot-based.yml b/.github/workflows/cypress-workflow-vanilla-snapshot-based.yml
@@ -8,8 +8,6 @@ on:
     branches:
       - main
       - dev-*
-env:
-  VERSION: '2.0.0'
 jobs:
   tests:
     name: Run Cypress E2E tests
@@ -34,26 +32,31 @@ jobs:
       #   working-directory: monetery-test
       #   run: |
       #     echo "VERSION=$(yarn --silent pkg-version)" >> $GITHUB_ENV
+      - name: Get package version
+        working-directory: monetery-test
+        run: |
+          echo "VERSION=$(yarn --silent pkg-version)" >> $GITHUB_ENV
       - name: Get and run OpenSearch
         run: |
-          wget https://artifacts.opensearch.org/snapshots/core/opensearch/${{ env.VERSION }}-SNAPSHOT/opensearch-min-${{ env.VERSION }}-SNAPSHOT-linux-x64-latest.tar.gz
-          tar -xzf opensearch-min-${{ env.VERSION }}-SNAPSHOT-linux-x64-latest.tar.gz
-          cd opensearch-${{ env.VERSION }}-SNAPSHOT/
+          wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${{ env.VERSION }}/latest/linux/x64/tar/builds/opensearch/dist/opensearch-min-${{ env.VERSION }}-linux-x64.tar.gz
+          tar -xzf opensearch-min-${{ env.VERSION }}-linux-x64.tar.gz
+          cd opensearch-${{ env.VERSION }}/
           bin/opensearch &
           timeout 300 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9200)" != "200" ]]; do sleep 5; done'
       - name: Get OpenSearch-Dashboards
         run: |
-          wget https://artifacts.opensearch.org/snapshots/core/opensearch-dashboards/${{ env.VERSION }}-SNAPSHOT/opensearch-dashboards-min-${{ env.VERSION }}-SNAPSHOT-linux-x64-latest.tar.gz
-          tar -xzf opensearch-dashboards-min-${{ env.VERSION }}-SNAPSHOT-linux-x64-latest.tar.gz
+          wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/${{ env.VERSION }}/latest/linux/x64/tar/builds/opensearch-dashboards/dist/opensearch-dashboards-min-${{ env.VERSION }}-linux-x64.tar.gz
+          tar -xzf opensearch-dashboards-min-${{ env.VERSION }}-linux-x64.tar.gz
       - name: Run OpenSearch-Dashboards server
         run: |
-          cd opensearch-dashboards-${{ env.VERSION }}-SNAPSHOT-linux-x64
+          cd opensearch-dashboards-${{ env.VERSION }}-linux-x64
           bin/opensearch-dashboards serve &
           timeout 300 bash -c 'while [[ "$(curl -s localhost:5601/api/status | jq -r '.status.overall.state')" != "green" ]]; do sleep 5; done'
       - name: Get Cypress version
         id: cypress_version
         run: |
-          echo "::set-output name=cypress_version::$(cat ./monetery-test/package.json | jq '.devDependencies.cypress' | tr -d '"')"
+          cypress_version_temp=$(cat ./monetery-test/package.json | jq -r '.devDependencies.cypress')
+          echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
       - name: Cache Cypress
         id: cache-cypress
         uses: actions/cache@v1

diff --git a/.github/workflows/cypress-workflow-vanilla-source-based.yml.disabled b/.github/workflows/cypress-workflow-vanilla-source-based.yml.disabled
diff --git a/.github/workflows/release-e2e-workflow-template.yml b/.github/workflows/release-e2e-workflow-template.yml
@@ -69,7 +69,8 @@ jobs:
       - name: Get node and yarn versions
         id: versions
         run: |
-          echo "::set-output name=node_version::$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")"
+          node_version_temp=$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")
+          echo "node_version=$node_version_temp" >> $GITHUB_ENV
       - name: Setup node
         uses: actions/setup-node@v1
         with:
@@ -95,7 +96,8 @@ jobs:
       - name: Get Cypress version
         id: cypress_version
         run: |
-          echo "::set-output name=cypress_version::$(cat ./cypress-test/package.json | jq '.devDependencies.cypress' | tr -d '"')"
+          cypress_version_temp=$(cat ./monetery-test/package.json | jq -r '.devDependencies.cypress')
+          echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
       - name: Cache Cypress
         id: cache-cypress
         uses: actions/cache@v1

diff --git a/.github/workflows/release-signoff-chrome.yml b/.github/workflows/release-signoff-chrome.yml
@@ -35,7 +35,8 @@ jobs:
       - name: Get node and yarn versions
         id: versions
         run: |
-          echo "::set-output name=node_version::$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")"
+          node_version_temp=$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")
+          echo "node_version=$node_version_temp" >> $GITHUB_ENV
       - name: Setup node
         uses: actions/setup-node@v1
         with:
@@ -49,7 +50,8 @@ jobs:
       - name: Get Cypress version
         id: cypress_version
         run: |
-          echo "::set-output name=cypress_version::$(cat ./functional-test/package.json | jq '.devDependencies.cypress' | tr -d '"')"
+          cypress_version_temp=$(cat ./monetery-test/package.json | jq -r '.devDependencies.cypress')
+          echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
       - name: Cache Cypress
         id: cache-cypress
         uses: actions/cache@v1

diff --git a/.github/workflows/release-signoff-chromium-ad-only.yml b/.github/workflows/release-signoff-chromium-ad-only.yml
@@ -35,7 +35,8 @@ jobs:
       - name: Get node and yarn versions
         id: versions
         run: |
-          echo "::set-output name=node_version::$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")"
+          node_version_temp=$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")
+          echo "node_version=$node_version_temp" >> $GITHUB_ENV
       - name: Setup node
         uses: actions/setup-node@v1
         with:
@@ -49,7 +50,8 @@ jobs:
       - name: Get Cypress version
         id: cypress_version
         run: |
-          echo "::set-output name=cypress_version::$(cat ./functional-test/package.json | jq '.devDependencies.cypress' | tr -d '"')"
+          cypress_version_temp=$(cat ./monetery-test/package.json | jq -r '.devDependencies.cypress')
+          echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
       - name: Cache Cypress
         id: cache-cypress
         uses: actions/cache@v1

diff --git a/.github/workflows/release-signoff-chromium-ism-only.yml b/.github/workflows/release-signoff-chromium-ism-only.yml
@@ -35,7 +35,8 @@ jobs:
       - name: Get node and yarn versions
         id: versions
         run: |
-          echo "::set-output name=node_version::$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")"
+          node_version_temp=$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")
+          echo "node_version=$node_version_temp" >> $GITHUB_ENV
       - name: Setup node
         uses: actions/setup-node@v1
         with:
@@ -49,7 +50,8 @@ jobs:
       - name: Get Cypress version
         id: cypress_version
         run: |
-          echo "::set-output name=cypress_version::$(cat ./functional-test/package.json | jq '.devDependencies.cypress' | tr -d '"')"
+          cypress_version_temp=$(cat ./monetery-test/package.json | jq -r '.devDependencies.cypress')
+          echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
       - name: Cache Cypress
         id: cache-cypress
         uses: actions/cache@v1

diff --git a/.github/workflows/release-signoff-chromium-tests-in-memory-0.yml b/.github/workflows/release-signoff-chromium-tests-in-memory-0.yml
@@ -35,7 +35,8 @@ jobs:
       - name: Get node and yarn versions
         id: versions
         run: |
-          echo "::set-output name=node_version::$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")"
+          node_version_temp=$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")
+          echo "node_version=$node_version_temp" >> $GITHUB_ENV
       - name: Setup node
         uses: actions/setup-node@v1
         with:
@@ -49,7 +50,8 @@ jobs:
       - name: Get Cypress version
         id: cypress_version
         run: |
-          echo "::set-output name=cypress_version::$(cat ./functional-test/package.json | jq '.devDependencies.cypress' | tr -d '"')"
+          cypress_version_temp=$(cat ./monetery-test/package.json | jq -r '.devDependencies.cypress')
+          echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
       - name: Cache Cypress
         id: cache-cypress
         uses: actions/cache@v1

diff --git a/.github/workflows/release-signoff-chromium-tests-in-memory-10.yml b/.github/workflows/release-signoff-chromium-tests-in-memory-10.yml
@@ -35,7 +35,8 @@ jobs:
       - name: Get node and yarn versions
         id: versions
         run: |
-          echo "::set-output name=node_version::$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")"
+          node_version_temp=$(node -p "(require('./opensearch-dashboards-${{ env.VERSION }}/package.json').engines.node).match(/[.0-9]+/)[0]")
+          echo "node_version=$node_version_temp" >> $GITHUB_ENV
       - name: Setup node
         uses: actions/setup-node@v1
         with:
@@ -49,7 +50,8 @@ jobs:
       - name: Get Cypress version
         id: cypress_version
         run: |
-          echo "::set-output name=cypress_version::$(cat ./functional-test/package.json | jq '.devDependencies.cypress' | tr -d '"')"
+          cypress_version_temp=$(cat ./monetery-test/package.json | jq -r '.devDependencies.cypress')
+          echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
       - name: Cache Cypress
         id: cache-cypress
         uses: actions/cache@v1