Skip to content

Commit 0a19e7b

Browse files
Ensuring cleanup with OSD plugins when failed during continue-on-error (#4343)
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent a294e5e commit 0a19e7b

File tree

2 files changed

+21
-2
lines changed
  • scripts

2 files changed

+21
-2
lines changed

scripts/components/ganttChartDashboards/build.sh

+10-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
set -ex
1111

12+
# vars / libs
13+
. ../../../lib/shell/file_management.sh
14+
PLUGIN_PATH=$PWD
15+
1216
function usage() {
1317
echo "Usage: $0 [args]"
1418
echo ""
@@ -22,6 +26,12 @@ function usage() {
2226
echo -e "-h help"
2327
}
2428

29+
function cleanup_all() {
30+
File_Delete $PLUGIN_PATH
31+
}
32+
33+
trap cleanup_all TERM INT EXIT
34+
2535
while getopts ":h:v:q:s:o:p:a:" arg; do
2636
case $arg in
2737
h)
@@ -87,4 +97,3 @@ cd plugins/$PLUGIN_FOLDER; yarn plugin-helpers build --opensearch-dashboards-ver
8797
cd $CURR_DIR
8898
echo "COPY $PLUGIN_NAME.zip"
8999
cp -r ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER/build/$PLUGIN_NAME-$VERSION$QUALIFIER_IDENTIFIER.zip $OUTPUT/plugins/
90-
rm -rf ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER

scripts/default/opensearch-dashboards/build.sh

+11-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
set -ex
1111

12+
# vars / libs
13+
. ../../../lib/shell/file_management.sh
14+
PLUGIN_PATH=$PWD
15+
1216
function usage() {
1317
echo "Usage: $0 [args]"
1418
echo ""
@@ -22,6 +26,13 @@ function usage() {
2226
echo -e "-h help"
2327
}
2428

29+
30+
function cleanup_all() {
31+
File_Delete $PLUGIN_PATH
32+
}
33+
34+
trap cleanup_all TERM INT EXIT
35+
2536
while getopts ":h:v:q:s:o:p:a:" arg; do
2637
case $arg in
2738
h)
@@ -92,4 +103,3 @@ cd plugins/$PLUGIN_NAME; yarn $HELPER_STRING build --opensearch-dashboards-versi
92103
cd $CURR_DIR
93104
echo "COPY $PLUGIN_NAME.zip"
94105
cp -r ../OpenSearch-Dashboards/plugins/$PLUGIN_NAME/build/$PLUGIN_NAME-$VERSION$QUALIFIER_IDENTIFIER.zip $OUTPUT/plugins/
95-
rm -rf ../OpenSearch-Dashboards/plugins/$PLUGIN_NAME

0 commit comments

Comments
 (0)