From e460895b44f78dc32881b9987f103ed58ac33f12 Mon Sep 17 00:00:00 2001
From: Greg Gauthier <greg.gauthier@ecs.co.uk>
Date: Fri, 27 Jan 2023 16:14:40 +0000
Subject: [PATCH] pipeline refactor

---
 bitbucket-pipelines.yml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 587b828..e6e5f48 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -1,17 +1,18 @@
 pipelines:
   default:
-    - parallel:
-      - step:
-          runs-on:
-            - self.hosted
-            - macos
-          name: Run Webtests
-          caches:
-            - maven
-          script:
-            - mvn -B verify --file pom.xml
-            - mvn compiler:compile
-            - mvn compiler:testCompile
-            - mvn surefire:test
-            - export REPORTPATH="target/test-reports/*.*"
-            - curl -H "Authorization: Bearer ${BEARER_TOKEN}" -X POST "https://api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/downloads" --form files=@"${REPORTPATH}"
+    - step:
+        name: Build and Test
+        caches:
+          - maven
+        runs-on:
+          - self.hosted
+          - macos
+        script:
+          - mvn -B verify --file pom.xml
+          - mvn compiler:compile
+          - mvn compiler:testCompile
+          - mvn surefire:test
+          - export REPORTPATH="target/test-reports/*.*"
+          - export CMD="curl -H \"Authorization: Bearer ${BEARER_TOKEN}\" -X POST \"https://api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/downloads\" --form files=@\"${REPORTPATH}\""
+          - sh ${CMD}
+