Skip to content

Commit 37a64fd

Browse files
authored
[devops] Enhance patch module in CI/CD (#594)
1 parent a3e149f commit 37a64fd

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

optools/run_bvt.sh

+15-14
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,14 @@ function make_one(){
149149
}
150150

151151
function patch_one(){
152-
cd $ONE_REPO
153-
logger "INF" "Patch fix issue to select max_allowed_packet"
154-
if [[ ! -f $G_STAGE/patches/max_allowed_packet.txt ]]; then
155-
logger "ERR" "Not found patch file to fix issue \"select max_allowed_packet\""
156-
exit 1
152+
cd $G_STAGE
153+
if [[ -f patch_one.sh ]]; then
154+
logger "INF" "Patch issue fix"
155+
./patch_one.sh
156+
else
157+
logger "INF" "Not found patch"
157158
fi
158-
cp -f pkg/frontend/mysql_cmd_executor.go $G_STAGE/mysql_cmd_executor.go.orig
159-
sed -i "855 r $G_STAGE/patches/max_allowed_packet.txt" pkg/frontend/mysql_cmd_executor.go
160-
cp -f pkg/frontend/mysql_cmd_executor.go $G_STAGE/mysql_cmd_executor.go.patched
159+
161160
}
162161

163162
function run_bvt(){
@@ -185,12 +184,14 @@ function clean_up(){
185184

186185

187186
horiz_rule
188-
echo "# OS TYPE: $G_OSTYPE"
189-
echo "# CASE TYPE: $CASE_TYPE"
190-
echo "# BUILD BIN: $MAKE_ONE"
191-
echo "# LOG PATH: $G_WKSP"
192-
echo "# GO ROOT: $GOROOT"
193-
echo "# GO PATH: $GOPATH"
187+
echo "# OS TYPE: $G_OSTYPE"
188+
echo "# CASE TYPE: $CASE_TYPE"
189+
echo "# BUILD BINARY: $MAKE_ONE"
190+
echo "# GO ROOT: $GOROOT"
191+
echo "# GO PATH: $GOPATH"
192+
echo "# SRV LOG PATH: $SRV_LOG"
193+
echo "# SRS LOG PATH: $SRS_LOG"
194+
echo "# TST LOG PATH: $TST_LOG"
194195
horiz_rule
195196

196197
clean_up

0 commit comments

Comments
 (0)