Fix cherry-picks

Author: michel-laterman

.buildkite/pipeline.yml

@@ -83,31 +83,6 @@ steps:
           - build/*.xml
           - build/coverage*.out
 
-<<<<<<< HEAD
-=======
-      - label: ":smartbear-testexecute: Run unit tests with requirefips build tag"
-        key: unit-test-fips-tag
-        command: ".buildkite/scripts/unit_test.sh"
-        env:
-          FIPS: "true"
-        agents:
-          provider: "gcp"
-        artifact_paths:
-          - build/*.xml
-          - build/coverage*.out
-
-      - label: ":smartbear-testexecute: Run fips140=only unit tests"
-        key: unit-test-fips140-only
-        command: ".buildkite/scripts/unit_test_fipsonly.sh"
-        env:
-          FIPS: "true"
-        agents:
-          provider: "gcp"
-        artifact_paths:
-          - build/*.xml
-          - build/coverage*.out
-
->>>>>>> db5f46b (Convert Makefile to magefile.go (#4912))
       - label: ":smartbear-testexecute: Run unit tests: MacOS 13"
         key: unit-test-macos-13
         command: ".buildkite/scripts/unit_test.sh"
@@ -132,25 +107,19 @@ steps:
       - label: "E2E Test"
         key: "e2e-test"
         command: ".buildkite/scripts/e2e_test.sh"
-<<<<<<< HEAD
         env:
           TESTCONTAINERS_RYUK_CONTAINER_PRIVILEGED: "true"
-=======
->>>>>>> db5f46b (Convert Makefile to magefile.go (#4912))
         agents:
           provider: "gcp"
         artifact_paths:
           - build/*.xml
           - build/e2e-coverage.out
-<<<<<<< HEAD
-=======
         plugins:
           - test-collector#v1.10.2:
               files: "build/test-*.xml"
               format: "junit"
               branches: "main"
               debug: true
->>>>>>> db5f46b (Convert Makefile to magefile.go (#4912))
 
       - label: ":junit: Junit annotate"
         plugins:

.buildkite/scripts/common.sh

@@ -51,21 +51,6 @@ with_go() {
     export PATH="${PATH}:$(go env GOPATH):$(go env GOPATH)/bin"
 }
 
-<<<<<<< HEAD
-=======
-with_msft_go() {
-    echo "Setting up microsoft/go"
-    create_workspace
-    check_platform_architeture
-    MSFT_DOWNLOAD_URL=https://aka.ms/golang/release/latest/go$(cat .go-version).${platform_type}-${arch_type}.tar.gz
-    retry 5 $(curl -sL -o - $MSFT_DOWNLOAD_URL | tar -xz -f - -C ${WORKSPACE})
-    export PATH="${PATH}:${WORKSPACE}/go/bin"
-    go version
-    which go
-    export PATH="${PATH}:$(go env GOPATH)/bin"
-}
-
->>>>>>> db5f46b (Convert Makefile to magefile.go (#4912))
 with_docker_compose() {
     echo "Setting up the Docker-compose environment..."
     create_workspace
@@ -162,4 +147,4 @@ cleanup() {
     echo "Deleting temporary files..."
     rm -rf ${WORKSPACE}/${TMP_FOLDER_TEMPLATE_BASE}.*
     echo "Done."
-}
+}

.buildkite/scripts/local_build.sh

@@ -7,10 +7,6 @@ source .buildkite/scripts/common.sh
 add_bin_path
 with_go
 
-<<<<<<< HEAD
-make local
-=======
 with_mage
 
 mage build:local
->>>>>>> db5f46b (Convert Makefile to magefile.go (#4912))

.buildkite/scripts/unit_test_fipsonly.sh

@@ -7,15 +7,10 @@ RUN \
   && apt-get install --no-install-recommends -y zip \
   && apt-get clean
 
-<<<<<<< HEAD
-WORKDIR /go/src/github.com/elastic/fleet-server
-
-=======
 RUN groupadd --gid 1000 fleet-server && \
     useradd -M -d /fleet-server/ --uid 1000 --gid 1000 fleet-server
 USER fleet-server
 WORKDIR /fleet-server/
->>>>>>> db5f46b (Convert Makefile to magefile.go (#4912))
 # pre-copy/cache go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
 COPY go.mod go.sum ./
 RUN go mod download && go mod verify