APM-6127 separate out steps and use condition field

Author: sophieclayton12-nhs

azure/templates/run-smoke-tests.yml

@@ -6,23 +6,24 @@ parameters:
 steps:
   - bash: |
       make install-python
-    workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
-    displayName: Setup pytests
 
-  - bash: |
       export PROXY_NAME="$(FULLY_QUALIFIED_SERVICE_NAME)"
       export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
       export SOURCE_COMMIT_ID="$(Build.SourceVersion)"
+    workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
+    displayName: Setup pytests
 
-      if [ "${{ parameters.production }}" = "true" ]; then
-        echo "Running smoketest-prod"
-        make smoketest-prod
-      else
-        echo "Running smoketest"
-        make smoketest
-      fi
+  - bash: |
+      make smoketest-prod
+    condition: eq(${{ parameters.production }}, true)
+    workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
+    displayName: Run smoketest-prod
+
+  - bash: |
+      make smoketest
+    condition: ne(${{ parameters.production }}, true)
     workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
-    displayName: run smoketests
+    displayName: Run smoketest
 
   - task: PublishTestResults@2
     displayName: 'Publish smoketest results'