Merge remote-tracking branch 'origin/master'

# Conflicts:
#	deploy/pcm-coordinator-api.Jenkinsfile
#	deploy/pcm-coordinator-rpc.Jenkinsfile


Former-commit-id: 2daa2c067f

deploy/pcm-coordinator-api.Jenkinsfile

@@ -69,7 +69,7 @@ podTemplate(label: label, containers: [
                         sed -i 's#image_name#${image}#' ${project_name}.yaml
                         sed -i 's#secret_name#${secret_name}#' ${project_name}.yaml
                         sed -i 's#nacos_host#${nacos_host}#' ${project_name}.yaml
-                        cat ${PROJECT_NAME}.yaml
+                        cat ${project_name}.yaml
                         kubectl apply -f ${project_name}.yaml
                     """
                 }

deploy/pcm-coordinator-rpc.Jenkinsfile

@@ -68,7 +68,7 @@ podTemplate(label: label, containers: [
                         sed -i 's#image_name#${image}#' ${project_name}.yaml
                         sed -i 's#secret_name#${secret_name}#' ${project_name}.yaml
                         sed -i 's#nacos_host#${nacos_host}#' ${project_name}.yaml
-                        cat ${PROJECT_NAME}.yaml
+                        cat ${project_name}.yaml
                         kubectl apply -f ${project_name}.yaml
                     """
                 }