From 9cc6d55d5303d8992afeeb518ec6e439bb1a5c57 Mon Sep 17 00:00:00 2001
From: Lukasz Dziedziak <lukidzi@gmail.com>
Date: Fri, 13 Dec 2024 15:17:32 +0100
Subject: [PATCH] resolve

Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
---
 .github/workflows/build-test-distribute.yaml | 60 --------------------
 .github/workflows/e2e.yaml                   |  2 +-
 2 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/.github/workflows/build-test-distribute.yaml b/.github/workflows/build-test-distribute.yaml
index 456948d1e0d6..ccb2b4639aa2 100644
--- a/.github/workflows/build-test-distribute.yaml
+++ b/.github/workflows/build-test-distribute.yaml
@@ -75,67 +75,7 @@ jobs:
       - run: |
           make dev/tools
       - run: |
-<<<<<<< HEAD
           make test
-=======
-          make clean
-      - run: |
-          make check
-      - id: sca-project
-        uses: Kong/public-shared-actions/security-actions/sca@28d20a1f492927f35b00b317acd78f669c45f88b # v2.7.3
-        with:
-          dir: .
-          config: .syft.yaml
-          upload-sbom-release-assets: true
-      - id: metadata
-        run: |
-          echo "images=$(make images/info/release/json)" >> $GITHUB_OUTPUT
-          echo "registry=$(make docker/info/registry)" >> $GITHUB_OUTPUT
-          echo "version=$(make build/info/version)" >> $GITHUB_OUTPUT
-          echo "distribution_repository=$(make build/info/cloudsmith_repository)" >> $GITHUB_OUTPUT
-  test:
-    permissions:
-      contents: read
-    needs: ["check"]
-    uses: ./.github/workflows/_test.yaml
-    with:
-      FULL_MATRIX: ${{ needs.check.outputs.FULL_MATRIX }}
-      RUNNERS_BY_ARCH: ${{ (github.event_name == 'push' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-latest","arm64":""}' }}
-    secrets: inherit
-  build_publish:
-    permissions:
-      contents: read
-      id-token: write
-    needs: ["check", "test"]
-    uses: ./.github/workflows/_build_publish.yaml
-    if: ${{ fromJSON(needs.check.outputs.BUILD) }}
-    with:
-      FULL_MATRIX: ${{ needs.check.outputs.FULL_MATRIX }}
-      ALLOW_PUSH: ${{ needs.check.outputs.ALLOW_PUSH }}
-      IMAGE_ARTIFACT_NAME: "image_artifacts"
-      BINARY_ARTIFACT_NAME: "binary_artifacts"
-      IMAGES: ${{ needs.check.outputs.IMAGES }}
-      REGISTRY: ${{ needs.check.outputs.REGISTRY }}
-      NOTARY_REPOSITORY: ${{ needs.check.outputs.NOTARY_REPOSITORY }}
-      VERSION_NAME: ${{ needs.check.outputs.VERSION_NAME }}
-    secrets: inherit
-  provenance:
-    needs: ["check", "build_publish"]
-    if: ${{ github.ref_type == 'tag' }}
-    uses: ./.github/workflows/_provenance.yaml
-    secrets: inherit
-    permissions:
-      contents: write
-      id-token: write # For using token to sign images
-      actions: read # For getting workflow run info to build provenance
-      packages: write # Required for publishing provenance. Issue: https://github.com/slsa-framework/slsa-github-generator/tree/main/internal/builders/container#known-issues
-    with:
-      BINARY_ARTIFACTS_HASH_AS_FILE: ${{ needs.build_publish.outputs.BINARY_ARTIFACT_DIGEST_BASE64 }}
-      IMAGES: ${{ needs.check.outputs.IMAGES }}
-      REGISTRY: ${{ needs.check.outputs.REGISTRY }}
-      NOTARY_REPOSITORY: ${{ needs.check.outputs.NOTARY_REPOSITORY }}
-      IMAGE_DIGESTS: ${{ needs.build_publish.outputs.IMAGE_DIGESTS }}
->>>>>>> ca2f6cf35 (test(e2e): reenable amd64 self-hosted runners (#11937))
   distributions:
     needs: ["check", "test", "test_e2e", "test_e2e_env"]
     if: ${{ always() }}
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index ce1fd9f8263f..f5c138c3f6d9 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -7,7 +7,7 @@ on:
       runnersByArch:
         type: string
         required: false
-        default: '{"amd64": "ubuntu-latest", "arm64": "ubuntu-latest-arm64-kong"}'
+        default: '{"amd64": "ubuntu-latest-kong", "arm64": "ubuntu-latest-arm64-kong"}'
     secrets:
       circleCIToken:
         required: true