Ensure testbox Java deploy uses clean test jars
This commit is contained in:
parent
dafd78b71b
commit
051259d720
@ -83,6 +83,44 @@ java_module_for_service() {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clean_java_service_jars() {
|
||||||
|
local java_dir="$1"
|
||||||
|
shift
|
||||||
|
local service
|
||||||
|
|
||||||
|
for service in "$@"; do
|
||||||
|
case "$service" in
|
||||||
|
auth)
|
||||||
|
rm -f "$java_dir/rc-auth/target/rc-auth-"*.jar "$java_dir/rc-auth/target/rc-auth-"*.jar.original
|
||||||
|
;;
|
||||||
|
gateway)
|
||||||
|
rm -f "$java_dir/rc-gateway/target/rc-gateway-"*.jar "$java_dir/rc-gateway/target/rc-gateway-"*.jar.original
|
||||||
|
;;
|
||||||
|
external)
|
||||||
|
rm -f "$java_dir/rc-service/rc-service-external/external-start/target/rc-service-external-"*.jar "$java_dir/rc-service/rc-service-external/external-start/target/rc-service-external-"*.jar.original
|
||||||
|
;;
|
||||||
|
console)
|
||||||
|
rm -f "$java_dir/rc-service/rc-service-console/console-start/target/rc-service-console-"*.jar "$java_dir/rc-service/rc-service-console/console-start/target/rc-service-console-"*.jar.original
|
||||||
|
;;
|
||||||
|
other)
|
||||||
|
rm -f "$java_dir/rc-service/rc-service-other/other-start/target/rc-service-other-"*.jar "$java_dir/rc-service/rc-service-other/other-start/target/rc-service-other-"*.jar.original
|
||||||
|
;;
|
||||||
|
live)
|
||||||
|
rm -f "$java_dir/rc-service/rc-service-live/live-start/target/rc-service-live-"*.jar "$java_dir/rc-service/rc-service-live/live-start/target/rc-service-live-"*.jar.original
|
||||||
|
;;
|
||||||
|
wallet)
|
||||||
|
rm -f "$java_dir/rc-service/rc-service-wallet/wallet-start/target/rc-service-wallet-"*.jar "$java_dir/rc-service/rc-service-wallet/wallet-start/target/rc-service-wallet-"*.jar.original
|
||||||
|
;;
|
||||||
|
order)
|
||||||
|
rm -f "$java_dir/rc-service/rc-service-order/order-start/target/rc-service-order-"*.jar "$java_dir/rc-service/rc-service-order/order-start/target/rc-service-order-"*.jar.original
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
return 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
service_for_java_path() {
|
service_for_java_path() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
rc-auth/*|nacos_config/rc-auth/*) echo "auth" ;;
|
rc-auth/*|nacos_config/rc-auth/*) echo "auth" ;;
|
||||||
@ -146,6 +184,7 @@ build_and_restart_java() {
|
|||||||
if [ -x ./ci/install-private-maven.sh ]; then
|
if [ -x ./ci/install-private-maven.sh ]; then
|
||||||
./ci/install-private-maven.sh >>"$LOG_FILE" 2>&1
|
./ci/install-private-maven.sh >>"$LOG_FILE" 2>&1
|
||||||
fi
|
fi
|
||||||
|
clean_java_service_jars "$java_dir" "${services[@]}"
|
||||||
mvn -Ptest -T 1C -pl "$modules" -am -Dmaven.test.skip=true package >>"$LOG_FILE" 2>&1
|
mvn -Ptest -T 1C -pl "$modules" -am -Dmaven.test.skip=true package >>"$LOG_FILE" 2>&1
|
||||||
|
|
||||||
cd "$ROOT_DIR"
|
cd "$ROOT_DIR"
|
||||||
|
|||||||
@ -28,6 +28,28 @@ if [ -x ./ci/install-private-maven.sh ]; then
|
|||||||
./ci/install-private-maven.sh
|
./ci/install-private-maven.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
clean_java_service_jars() {
|
||||||
|
rm -f \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-auth/target/rc-auth-"*.jar \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-auth/target/rc-auth-"*.jar.original \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-gateway/target/rc-gateway-"*.jar \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-gateway/target/rc-gateway-"*.jar.original \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-external/external-start/target/rc-service-external-"*.jar \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-external/external-start/target/rc-service-external-"*.jar.original \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-console/console-start/target/rc-service-console-"*.jar \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-console/console-start/target/rc-service-console-"*.jar.original \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-other/other-start/target/rc-service-other-"*.jar \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-other/other-start/target/rc-service-other-"*.jar.original \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-live/live-start/target/rc-service-live-"*.jar \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-live/live-start/target/rc-service-live-"*.jar.original \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-wallet/wallet-start/target/rc-service-wallet-"*.jar \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-wallet/wallet-start/target/rc-service-wallet-"*.jar.original \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-order/order-start/target/rc-service-order-"*.jar \
|
||||||
|
"$JAVA_SOURCE_DIR/rc-service/rc-service-order/order-start/target/rc-service-order-"*.jar.original
|
||||||
|
}
|
||||||
|
|
||||||
|
clean_java_service_jars
|
||||||
|
|
||||||
JAVA_MODULES="rc-auth,rc-gateway,rc-service/rc-service-external/external-start,rc-service/rc-service-console/console-start,rc-service/rc-service-other/other-start,rc-service/rc-service-live/live-start,rc-service/rc-service-wallet/wallet-start,rc-service/rc-service-order/order-start"
|
JAVA_MODULES="rc-auth,rc-gateway,rc-service/rc-service-external/external-start,rc-service/rc-service-console/console-start,rc-service/rc-service-other/other-start,rc-service/rc-service-live/live-start,rc-service/rc-service-wallet/wallet-start,rc-service/rc-service-order/order-start"
|
||||||
mvn -Ptest -T 1C -pl "$JAVA_MODULES" -am -Dmaven.test.skip=true package
|
mvn -Ptest -T 1C -pl "$JAVA_MODULES" -am -Dmaven.test.skip=true package
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user