From 9c3ba49bef481071a1180a7ce1f17ff3c5b216dc Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 26 Dec 2023 15:31:31 -0500 Subject: [PATCH] Remove txt file option and pass in env variable (#1707) Signed-off-by: Derek Ho --- .github/workflows/cypress-test-oidc-e2e.yml | 9 ++------- .github/workflows/cypress-test-saml-e2e.yml | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cypress-test-oidc-e2e.yml b/.github/workflows/cypress-test-oidc-e2e.yml index 1118d07d0..5fe91f4d5 100644 --- a/.github/workflows/cypress-test-oidc-e2e.yml +++ b/.github/workflows/cypress-test-oidc-e2e.yml @@ -21,6 +21,8 @@ jobs: matrix: os: [ ubuntu-latest ] runs-on: ${{ matrix.os }} + env: + OPENSEARCH_INITIAL_ADMIN_PASSWORD: admin steps: - name: Set up JDK @@ -157,13 +159,6 @@ jobs: echo "THIS IS THE SECURITY CONFIG FILE: " cat config.yml - # 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 - # Run any configuration scripts - name: Run Setup Script for Linux if: ${{ runner.os == 'Linux' }} diff --git a/.github/workflows/cypress-test-saml-e2e.yml b/.github/workflows/cypress-test-saml-e2e.yml index a8f051500..1029fa780 100644 --- a/.github/workflows/cypress-test-saml-e2e.yml +++ b/.github/workflows/cypress-test-saml-e2e.yml @@ -17,6 +17,8 @@ jobs: matrix: os: [ ubuntu-latest ] runs-on: ${{ matrix.os }} + env: + OPENSEARCH_INITIAL_ADMIN_PASSWORD: admin steps: - name: Set up JDK @@ -57,13 +59,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'}}