diff --git a/.github/actions/start-opensearch-with-one-plugin/action.yml b/.github/actions/start-opensearch-with-one-plugin/action.yml index c6d9b9e68b..b562851b0c 100644 --- a/.github/actions/start-opensearch-with-one-plugin/action.yml +++ b/.github/actions/start-opensearch-with-one-plugin/action.yml @@ -113,3 +113,7 @@ runs: $Headers = @{ Authorization = $baseCredentials } Invoke-WebRequest -SkipCertificateCheck -Uri 'https://localhost:9200/_cat/plugins' -Headers $Headers; shell: pwsh + + - if: always() + run: cat ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/logs/opensearch.log + shell: bash diff --git a/.github/workflows/bwc-tests.yml b/.github/workflows/bwc-tests.yml index ed65970a30..4a378c3e7d 100644 --- a/.github/workflows/bwc-tests.yml +++ b/.github/workflows/bwc-tests.yml @@ -1,4 +1,4 @@ -name: Backwards Compability Suite +name: Backwards Compatibility Suite on: [workflow_dispatch] diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml index f757e0aefb..d3900381f3 100644 --- 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 "yes | ./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" EOF - name: Create Setup Script if: ${{ runner.os == 'Windows' }} run: | New-Item .\setup.bat -type file - Set-Content .\setup.bat -Value "powershell.exe -noexit -command `"echo 'y' | .\opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT\plugins\${{ env.PLUGIN_NAME }}\tools\install_demo_configuration.bat`"" + Set-Content .\setup.bat -Value "powershell.exe .\opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT\plugins\${{ env.PLUGIN_NAME }}\tools\install_demo_configuration.bat -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 index 06fbf5ec51..88e3c185c0 100755 --- a/tools/install_demo_configuration.bat +++ b/tools/install_demo_configuration.bat @@ -62,6 +62,11 @@ 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 index 323618c89a..fc0d7de095 100755 --- a/tools/install_demo_configuration.sh +++ b/tools/install_demo_configuration.sh @@ -97,6 +97,10 @@ if [ "$cluster_mode" == 0 ] && [ "$assumeyes" == 0 ]; then esac fi +if [ "$assumeyes" == 1 ]; then + cluster_mode=1 + initsecurity=1 +fi set -e BASE_DIR="$DIR/../../.."