CCM-1179

Fixes regex that doesn't allow blank suffix values.

Author: Philip Skinner

azure/templates/deploy-service.yml

@@ -132,7 +132,7 @@ steps:
         export RELEASE_RELEASEID=$(Build.BuildId)
 
         if [[ $SERVICE_ARTIFACT_NAME == v* ]]; then
-          export DEPLOYED_VERSION=`echo $SERVICE_ARTIFACT_NAME | grep -o "v[0-9]\+\.[0-9]\+\.[0-9]\+-[[:alpha:]]\+" | tail -1`
+          export DEPLOYED_VERSION=`echo $SERVICE_ARTIFACT_NAME | grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" | tail -1`
         else
           export DEPLOYED_VERSION="${{ parameters.fully_qualified_service_name }}"
         fi
@@ -203,7 +203,7 @@ steps:
       source $(SERVICE_DIR)/.build_env_vars
 
       if [[ $SERVICE_ARTIFACT_NAME == v* ]]; then
-        export DEPLOYED_VERSION=`echo $SERVICE_ARTIFACT_NAME | grep -o "v[0-9]\+\.[0-9]\+\.[0-9]\+-[[:alpha:]]\+" | tail -1`
+        export DEPLOYED_VERSION=`echo $SERVICE_ARTIFACT_NAME | grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" | tail -1`
       else
         export DEPLOYED_VERSION="${{ parameters.fully_qualified_service_name }}"
       fi