Skip to content

Commit 49802d3

Browse files
committed
Add graceful handling for -t
Signed-off-by: Derek Ho <[email protected]>
1 parent 7937c24 commit 49802d3

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

action.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,12 @@ runs:
106106
echo "running linux security demo configuration setup"
107107
export OPENSEARCH_INITIAL_ADMIN_PASSWORD=${{ inputs.admin-password }}
108108
chmod +x ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.sh
109-
/bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.sh -t"
109+
if /bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.sh -t"; then
110+
echo "Command executed successfully."
111+
else
112+
echo "Command failed. Retrying without the -t option."
113+
/bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.sh"
114+
fi
110115
echo "plugins.security.unsupported.restapi.allow_securityconfig_modification: true" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/config/opensearch.yml
111116
shell: bash
112117

@@ -116,7 +121,12 @@ runs:
116121
echo "running windows security demo configuration setup"
117122
export OPENSEARCH_INITIAL_ADMIN_PASSWORD=${{ inputs.admin-password }}
118123
chmod +x ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.bat
119-
/bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.bat -t"
124+
if /bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.bat -t"; then
125+
echo "Command executed successfully."
126+
else
127+
echo "Command failed. Retrying without the -t option."
128+
/bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.bat"
129+
fi
120130
echo "plugins.security.unsupported.restapi.allow_securityconfig_modification: true" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/config/opensearch.yml
121131
shell: bash
122132

0 commit comments

Comments
 (0)