Revert "Windows Install Action Fix" (#2401)

* Reverts #2308 and uses -i -c as arguments to the windows program to make it equivalent to -y Signed-off-by: Craig Perkins <cwperx@amazon.com>
opensearch-project · Jan 13, 2023 · 9cdaeca · 9cdaeca
1 parent b0116b7
commit 9cdaeca
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml
@@ -39,14 +39,14 @@ jobs:
         run: |
           cat > setup.sh <<'EOF'
           chmod +x  ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh 
-          /bin/bash -c "./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh -y"
+          /bin/bash -c "yes | ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh"
           EOF
 
       - name: Create Setup Script
         if: ${{ runner.os == 'Windows' }}
         run: |
           New-Item .\setup.bat -type file
-          Set-Content .\setup.bat -Value "powershell.exe .\opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT\plugins\${{ env.PLUGIN_NAME }}\tools\install_demo_configuration.bat -y"
+          Set-Content .\setup.bat -Value "powershell.exe .\opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT\plugins\${{ env.PLUGIN_NAME }}\tools\install_demo_configuration.bat -i -c -y"
           Get-Content .\setup.bat
 
       - name: Run Opensearch with A Single Plugin

diff --git a/tools/install_demo_configuration.bat b/tools/install_demo_configuration.bat
@@ -62,11 +62,6 @@ if %cluster_mode% == 0 (
     )
 )
 
-if %assumeyes% == 1 (
-    set "initsecurity=1"
-    set "cluster_mode=1"
-)
-
 set BASE_DIR=%SCRIPT_DIR%\..\..\..\
 if not exist %BASE_DIR% (
     echo "basedir does not exist"

diff --git a/tools/install_demo_configuration.sh b/tools/install_demo_configuration.sh
@@ -97,11 +97,6 @@ if [ "$cluster_mode" == 0 ] && [ "$assumeyes" == 0 ]; then
 	esac
 fi
 
-if [ "$assumeyes" == 1 ]; then
-  cluster_mode=1
-  initsecurity=1
-fi
-
 set -e
 BASE_DIR="$DIR/../../.."
 if [ -d "$BASE_DIR" ]; then