Merge branch 'master' into revert-442-APM-4363-implement-ALB-sharding

Author: harryhmc

azure/templates/deploy-service.yml

@@ -69,13 +69,13 @@ steps:
     workingDirectory: "$(SERVICE_DIR)"
     displayName: "Check for ECS proxy definitions"
 
-  - task: s3-cache-action@1
-    inputs:
-      key: poetry | utils | $(UTILS_DIR)/poetry.lock
-      location: "$(UTILS_DIR)/.venv"
-      debug: true
-      alias: 'UtilsPreReq'
-    displayName: cache utils pre-requisites
+  # - task: s3-cache-action@1
+  #   inputs:
+  #     key: poetry | utils | $(UTILS_DIR)/poetry.lock
+  #     location: "$(UTILS_DIR)/.venv"
+  #     debug: true
+  #     alias: 'UtilsPreReq'
+  #   displayName: cache utils pre-requisites
 
   - bash: |
       n=0
@@ -85,7 +85,7 @@ steps:
         n=$((n+1))
       done
     workingDirectory: "$(UTILS_DIR)"
-    condition: ne(variables['CacheRestored-UtilsPreReq'], 'true')
+    # condition: ne(variables['CacheRestored-UtilsPreReq'], 'true')
     displayName: "Install utils pre-requisites"
 
   - bash: |
@@ -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