Skip to content

Commit

Permalink
Remove txt file option and pass in env variable (#1707)
Browse files Browse the repository at this point in the history
Signed-off-by: Derek Ho <[email protected]>
  • Loading branch information
derek-ho authored Dec 26, 2023
1 parent a889429 commit 9c3ba49
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 14 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/cypress-test-oidc-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
matrix:
os: [ ubuntu-latest ]
runs-on: ${{ matrix.os }}
env:
OPENSEARCH_INITIAL_ADMIN_PASSWORD: admin

steps:
- name: Set up JDK
Expand Down Expand Up @@ -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' }}
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/cypress-test-saml-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
matrix:
os: [ ubuntu-latest ]
runs-on: ${{ matrix.os }}
env:
OPENSEARCH_INITIAL_ADMIN_PASSWORD: admin

steps:
- name: Set up JDK
Expand Down Expand Up @@ -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'}}
Expand Down

0 comments on commit 9c3ba49

Please sign in to comment.