Commit 8f71628b by 李二毛

Merge branch 'development' into 'staging'

修改方法IsPublishableOf

See merge request liermao/microservice-autodevopspipelines!73
parents cf7e15f9 e8638e3c
Pipeline #4248 passed with stages
in 19 seconds
...@@ -135,5 +135,5 @@ function IsPublishableOf() ...@@ -135,5 +135,5 @@ function IsPublishableOf()
{ {
declare prefix=$1 declare prefix=$1
declare isP=($(grep -oP "(?<=${prefix}Publishable>)[^<]+" "/tmp/cicd.props")) declare isP=($(grep -oP "(?<=${prefix}Publishable>)[^<]+" "/tmp/cicd.props"))
eval $2=isP eval $2="${isP}"
} }
\ No newline at end of file
...@@ -28,7 +28,6 @@ else ...@@ -28,7 +28,6 @@ else
if [ "${isPublishable}" == "1" ]; if [ "${isPublishable}" == "1" ];
then then
GetServiceDir ${servicePrefix} ${serviceName} serviceDir GetServiceDir ${servicePrefix} ${serviceName} serviceDir
CreateConfig ${Environment} ${namespace} ${k8sApiServer} ${serviceDir} ${servicePrefix} ${accessToken} CreateConfig ${Environment} ${namespace} ${k8sApiServer} ${serviceDir} ${servicePrefix} ${accessToken}
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment