Ensuring cleanup with OSD plugins when failed during continue-on-error (

#4343) Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Jan 16, 2024 · 0a19e7b · 0a19e7b
1 parent a294e5e
commit 0a19e7b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/scripts/components/ganttChartDashboards/build.sh b/scripts/components/ganttChartDashboards/build.sh
@@ -9,6 +9,10 @@
 
 set -ex
 
+# vars / libs
+. ../../../lib/shell/file_management.sh
+PLUGIN_PATH=$PWD
+
 function usage() {
     echo "Usage: $0 [args]"
     echo ""
@@ -22,6 +26,12 @@ function usage() {
     echo -e "-h help"
 }
 
+function cleanup_all() {
+    File_Delete $PLUGIN_PATH
+}
+
+trap cleanup_all TERM INT EXIT
+
 while getopts ":h:v:q:s:o:p:a:" arg; do
     case $arg in
         h)
@@ -87,4 +97,3 @@ cd plugins/$PLUGIN_FOLDER; yarn plugin-helpers build --opensearch-dashboards-ver
 cd $CURR_DIR
 echo "COPY $PLUGIN_NAME.zip"
 cp -r ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER/build/$PLUGIN_NAME-$VERSION$QUALIFIER_IDENTIFIER.zip $OUTPUT/plugins/
-rm -rf ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER
diff --git a/scripts/default/opensearch-dashboards/build.sh b/scripts/default/opensearch-dashboards/build.sh
@@ -9,6 +9,10 @@
 
 set -ex
 
+# vars / libs
+. ../../../lib/shell/file_management.sh
+PLUGIN_PATH=$PWD
+
 function usage() {
     echo "Usage: $0 [args]"
     echo ""
@@ -22,6 +26,13 @@ function usage() {
     echo -e "-h help"
 }
 
+
+function cleanup_all() {
+    File_Delete $PLUGIN_PATH
+}
+
+trap cleanup_all TERM INT EXIT
+
 while getopts ":h:v:q:s:o:p:a:" arg; do
     case $arg in
         h)
@@ -92,4 +103,3 @@ cd plugins/$PLUGIN_NAME; yarn $HELPER_STRING build --opensearch-dashboards-versi
 cd $CURR_DIR
 echo "COPY $PLUGIN_NAME.zip"
 cp -r ../OpenSearch-Dashboards/plugins/$PLUGIN_NAME/build/$PLUGIN_NAME-$VERSION$QUALIFIER_IDENTIFIER.zip $OUTPUT/plugins/
-rm -rf ../OpenSearch-Dashboards/plugins/$PLUGIN_NAME