Fix plugin install

Signed-off-by: Stephen Crawford <[email protected]>
stephen-crawford · Sep 20, 2023 · 18c63f0 · 18c63f0
1 parent 0a1403f
commit 18c63f0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git 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
diff --git 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
@@ -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"