Merge branch 'main' into global-tenant-rest

Author: Hailong-am

cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/shared_links.spec.js

@@ -58,7 +58,13 @@ describe('shared links', () => {
       cy.getElementByTestId('shareTopNavButton').should('be.visible').click();
       cy.getElementByTestId('copyShareUrlButton')
         .invoke('attr', 'data-share-url')
-        .should('eq', url)
+        // Even though `CURRENT_TENANT.newTenant` is set to global, that could change and hence this test will remove
+        // either of the tenants it sees.
+        .should(
+          'satisfy',
+          (copied) =>
+            copied.replace(/\?security_tenant=(global|private)/, '') === url
+        )
         .then((url) => {
           cy.log(url);
           cy.request(url).its('status').should('eq', 200);

integtest.sh

@@ -216,9 +216,8 @@ fi
 # We need to ensure the cypress tests are the last execute process to
 # the error code gets passed to the CI.
 
-if [ "$OSTYPE" = "msys" ] || [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "win32" ]; then
-    echo "Disable video recording in Windows due to ffmpeg missing libs in Windows Docker Container"
-    echo "TODO: https://github.com/opensearch-project/opensearch-dashboards-functional-test/issues/1068"
+if [ "$DISABLE_VIDEO" = "true" ]; then
+    echo "Disable video recording when running tests in Cypress"
     jq '. + {"video": false}' cypress.json > cypress_new.json # jq does not allow reading and writing on same file
     mv -v cypress_new.json cypress.json
 fi