From 18c63f01fe67cc29d8e07c0372dd217efce00673 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Wed, 20 Sep 2023 12:41:25 -0400 Subject: [PATCH] Fix plugin install Signed-off-by: Stephen Crawford --- .github/workflows/plugin_install.yml | 5 ++++- config/secret/initialAdminPassword.txt | 0 tools/install_demo_configuration.bat | 2 +- tools/install_demo_configuration.sh | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 config/secret/initialAdminPassword.txt diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml index 5bfce0248b..b68f0b5c37 100644 --- a/.github/workflows/plugin_install.yml +++ b/.github/workflows/plugin_install.yml @@ -36,6 +36,9 @@ jobs: run: mv ./build/distributions/${{ env.PLUGIN_NAME }}-*.zip ${{ env.PLUGIN_NAME }}.zip shell: bash + - name: Populate password file + run: echo "installPassword" > ./config/secret/initialAdminPassword + - name: Create Setup Script if: ${{ runner.os == 'Linux' }} run: | @@ -62,4 +65,4 @@ jobs: uses: gradle/gradle-build-action@v2 with: cache-disabled: true - arguments: integTestRemote -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="opensearch" -Dhttps=true -Duser=admin -Dpassword=admin + arguments: integTestRemote -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="opensearch" -Dhttps=true -Duser=admin -Dpassword=installPassword diff --git a/config/secret/initialAdminPassword.txt b/config/secret/initialAdminPassword.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/install_demo_configuration.bat b/tools/install_demo_configuration.bat index 6964787840..dfb7c101dd 100755 --- a/tools/install_demo_configuration.bat +++ b/tools/install_demo_configuration.bat @@ -76,7 +76,7 @@ echo Basedir: %BASE_DIR% set "OPENSEARCH_CONF_FILE=%BASE_DIR%config\opensearch.yml" set "INTERNAL_USERS_FILE"=%BASE_DIR%config\internal_users.yml" -set "ADMIN_PASSWORD_FILE"=%BASE_DIR%config\admin_password.txt" +set "ADMIN_PASSWORD_FILE"=%BASE_DIR%config\secret\initialAdminPassword.txt" set "OPENSEARCH_CONF_DIR=%BASE_DIR%config\" set "OPENSEARCH_BIN_DIR=%BASE_DIR%bin\" set "OPENSEARCH_PLUGINS_DIR=%BASE_DIR%plugins\" diff --git a/tools/install_demo_configuration.sh b/tools/install_demo_configuration.sh index 8906d47ab5..2a8b863134 100755 --- a/tools/install_demo_configuration.sh +++ b/tools/install_demo_configuration.sh @@ -110,7 +110,7 @@ else fi OPENSEARCH_CONF_FILE="$BASE_DIR/config/opensearch.yml" INTERNAL_USERS_FILE="$BASE_DIR/config/internal_users.yml" -ADMIN_PASSWORD_FILE="$BASE_DIR/secret/initialAdminPassword.txt" +ADMIN_PASSWORD_FILE="$BASE_DIR/config/secret/initialAdminPassword.txt" OPENSEARCH_BIN_DIR="$BASE_DIR/bin" OPENSEARCH_PLUGINS_DIR="$BASE_DIR/plugins" OPENSEARCH_MODULES_DIR="$BASE_DIR/modules"