Merge remote-tracking branch 'upstream/main' into update-cypress-test…

…s-admin-password
DarshitChanpura · Jan 3, 2024 · 7c80407 · 7c80407
2 parents 10d9e2e + 9c3ba49
commit 7c80407
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/cypress-test-oidc-e2e.yml b/.github/workflows/cypress-test-oidc-e2e.yml
@@ -22,6 +22,8 @@ jobs:
       matrix:
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
+    env:
+      OPENSEARCH_INITIAL_ADMIN_PASSWORD: admin
 
     steps:
       - name: Set up JDK

diff --git a/.github/workflows/cypress-test-saml-e2e.yml b/.github/workflows/cypress-test-saml-e2e.yml
@@ -18,6 +18,8 @@ jobs:
       matrix:
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
+    env:
+      OPENSEARCH_INITIAL_ADMIN_PASSWORD: admin
 
     steps:
       - name: Set up JDK
@@ -58,13 +60,6 @@ jobs:
           rm -f opensearch-*.tar.gz
         shell: bash
 
-      # TODO: REMOVE THIS ONCE ADMIN JAVA TOOL SUPPORT IT
-      - name: Write password to opensearch_initial_admin_password.txt
-        if: ${{ runner.os == 'Linux'}}
-        run:
-          echo admin >> ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/config/opensearch_initial_admin_password.txt
-        shell: bash
-
       # Install the security plugin
       - name: Install Plugin into OpenSearch for Linux
         if: ${{ runner.os == 'Linux'}}