Merge branch 'main' into add-jwt-multiauth

opensearch-project · Oct 2, 2024 · f0a42fc · f0a42fc
2 parents 529db2e + dc3e5a9
commit f0a42fc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml
@@ -63,6 +63,12 @@ runs:
         fi
       shell: bash
 
+    - name: Compile OpenSearch Dashboards
+      run: |
+        cd OpenSearch-Dashboards
+        node scripts/build_opensearch_dashboards_platform_plugins --no-examples --workers=10 --verbose
+      shell: bash
+
     - name: Run OpenSearch Dashboards with provided configuration
       if: ${{ runner.os == 'Linux' }}
       run: |
@@ -80,13 +86,13 @@ runs:
       run: |
         cd ./OpenSearch-Dashboards
         echo "Start checking OpenSearch Dashboards."
-        for i in {1..60}; do
-          if grep -q "bundles compiled successfully after" "dashboard.log"; then
-            echo "OpenSearch Dashboards compiled successfully."
+        for i in {1..6}; do
+          if grep -q "http server running" "dashboard.log"; then
+            echo "OpenSearch Dashboards started successfully."
             break
           fi
-          if [ $i -eq 60 ]; then
-            echo "Timeout for 600 seconds reached. OpenSearch Dashboards did not finish compiling."
+          if [ $i -eq 6 ]; then
+            echo "Timeout for 60 seconds reached. OpenSearch Dashboards did not start."
             exit 1
           fi
           sleep 10

diff --git a/public/apps/configuration/panels/get-started.tsx b/public/apps/configuration/panels/get-started.tsx
@@ -61,7 +61,7 @@ const addBackendStep = {
           <ExternalLinkButton
             fill
             href={DocLinks.BackendConfigurationDoc}
-            text="Create config.yml"
+            text="Config.yml documentation"
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>

diff --git a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap
@@ -431,7 +431,7 @@ exports[`Get started (landing page) renders when backend configuration is enable
                     <ExternalLinkButton
                       fill={true}
                       href="https://opensearch.org/docs/latest/security-plugin/configuration/configuration/"
-                      text="Create config.yml"
+                      text="Config.yml documentation"
                     />
                   </EuiFlexItem>
                   <EuiFlexItem