Update ci.yml

Author: kruskall

.github/workflows/ci.yml

@@ -65,55 +65,6 @@ jobs:
             go-
       - run: go test -v -race ./...
 
-<<<<<<< HEAD
-=======
-  test-integration-server-internal:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: integrationservertest/go.mod
-          cache: false
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/go/pkg/mod/cache
-          key: integrationservertest-go-${{ hashFiles('integrationservertest/go.mod') }}
-          restore-keys: |
-            integration-server-test-go-
-      - env:
-          KIBANA_URL: "https://kibana.test"
-          KIBANA_USERNAME: "dummy"
-          KIBANA_PASSWORD: "dummy"
-          EC_URL: "https://elastic-cloud.test"
-          EC_API_KEY: "dummy"
-          EC_REGION: "gcp-us-west2"
-        # run integrationservertest/internal tests
-        # integrationservertest themselves are run in the integration-server-test pipeline
-        run: cd ./integrationservertest && go test -v -race ./internal/...
-
-  test-fips:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-          cache: false
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/go/pkg/mod/cache
-          key: go-${{ hashFiles('go.mod') }}
-          restore-keys: |
-            go-
-      - env:
-          GOFIPS140: "latest"
-          GODEBUG: "fips140=only"
-        run: go test -v -race -tags=requirefips ./...
-
->>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
   system-test:
     runs-on: ubuntu-latest
     steps:
@@ -135,32 +86,6 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: make system-test
 
-<<<<<<< HEAD
-=======
-  system-test-fips:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: systemtest/go.mod
-          cache: false
-      - run: docker compose up -d
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/go/pkg/mod/cache
-          key: systemtest-go-${{ hashFiles('systemtest/go.mod', 'go.mod') }}
-          restore-keys: |
-            systemtest-go-
-      - env:
-          GOTESTFLAGS: "-v -tags=requirefips"
-          GOFIPS140: "latest"
-          GODEBUG: "fips140=only"
-          GH_TOKEN: ${{ github.token }}
-        run: make system-test
-
->>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
   test-package:
     runs-on: ubuntu-latest
     steps: