Update tests and Makefile targets

grafana · Feb 14, 2025 · c31901a · c31901a
1 parent 9f3b0fe
commit c31901a
Show file tree

Hide file tree

Showing 20 changed files with 7 additions and 60 deletions.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -16,7 +16,6 @@ jobs:
           repository: grafana/grafana-github-actions
           path: ./actions
           ref: main
-          lfs: true
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Run backport

diff --git a/.github/workflows/check_ebpf_integrity.yml b/.github/workflows/check_ebpf_integrity.yml
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
@@ -15,7 +15,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          lfs: true
 
       - name: Install Clang-Format
         run: sudo apt-get install clang-format

diff --git a/.github/workflows/clang-tidy-check.yml b/.github/workflows/clang-tidy-check.yml
@@ -13,8 +13,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        with:
-          lfs: true
 
       - name: Install clang-tidy
         run: |

diff --git a/.github/workflows/generator-image.yml b/.github/workflows/generator-image.yml
@@ -18,8 +18,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          lfs: true
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -55,4 +53,4 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           tags: |
             "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.timestamp.outputs.ts }}"
-            "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main"
+            "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main"
diff --git a/.github/workflows/git-lfs-check.yml b/.github/workflows/git-lfs-check.yml
@@ -15,7 +15,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          lfs: true
 
       - name: Check git-lfs files
         run: |

diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml
@@ -27,7 +27,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # required for chart-testing to work
-          lfs: true
 
       - name: Regenerate docs
         run: |

diff --git a/.github/workflows/publish-technical-documentation-release.yml b/.github/workflows/publish-technical-documentation-release.yml
@@ -20,7 +20,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          lfs: true
       - uses: grafana/writers-toolkit/publish-technical-documentation-release@publish-technical-documentation-release/v2
         with:
           release_tag_regexp: '^v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$'

diff --git a/.github/workflows/publish_dockerhub_main.yml b/.github/workflows/publish_dockerhub_main.yml
@@ -16,8 +16,6 @@ jobs:
     steps:
       - id: checkout
         uses: actions/checkout@v4
-        with:
-          lfs: true
 
       - id: push-beyla-to-dockerhub
         uses: grafana/shared-workflows/actions/build-push-to-dockerhub@main

diff --git a/.github/workflows/publish_dockerhub_release.yml b/.github/workflows/publish_dockerhub_release.yml
@@ -16,8 +16,6 @@ jobs:
     steps:
       - id: checkout
         uses: actions/checkout@v4
-        with:
-          lfs: true
 
       - id: push-beyla-to-dockerhub
         uses: grafana/shared-workflows/actions/build-push-to-dockerhub@main

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:

diff --git a/.github/workflows/pull_request_check_license.yml b/.github/workflows/pull_request_check_license.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:

diff --git a/.github/workflows/pull_request_integration_tests.yml b/.github/workflows/pull_request_integration_tests.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
@@ -26,7 +24,7 @@ jobs:
           docker system prune -af
           docker volume prune -f
       - name: Run integration tests
-        run: make integration-test
+        run: make docker-generate integration-test
         timeout-minutes: 60
       - name: Upload integration test logs
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/pull_request_integration_tests_arm.yml b/.github/workflows/pull_request_integration_tests_arm.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
@@ -26,7 +24,7 @@ jobs:
           docker system prune -af
           docker volume prune -f
       - name: Run integration tests
-        run: make integration-test-arm
+        run: make docker-generate integration-test-arm
         timeout-minutes: 60
       - name: Upload integration test logs
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/pull_request_k8s_integration_tests.yml b/.github/workflows/pull_request_k8s_integration_tests.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
@@ -26,7 +24,7 @@ jobs:
           docker system prune -af
           docker volume prune -f
       - name: Run integration tests
-        run: make integration-test-k8s
+        run: make docker-generate integration-test-k8s
         timeout-minutes: 60
       - name: Upload integration test logs
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/pull_request_oats_test.yml b/.github/workflows/pull_request_oats_test.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:

diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
@@ -14,8 +14,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:

diff --git a/.github/workflows/update-offsets.yml b/.github/workflows/update-offsets.yml
@@ -9,8 +9,6 @@ jobs:
     steps:
     - name: "Checkout repo"
       uses: actions/checkout@v3
-      with:
-        lfs: true
     - name: "Update Go"
       uses: actions/setup-go@v4
       with:

diff --git a/.github/workflows/workflow_integration_tests_vm.yml b/.github/workflows/workflow_integration_tests_vm.yml
@@ -25,8 +25,6 @@ jobs:
         go: [ '1.22' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Clean up disk space
         run: |
           docker system prune -af
@@ -37,6 +35,7 @@ jobs:
           sudo apt-get install -y --no-install-recommends qemu-utils qemu-system-x86
       - name: Run VM integration tests
         run: |
+          make docker-generate
           sudo make -C test/vm KERNEL_VER=${{ inputs.kernel-version }} ARCH=${{ inputs.arch }} && [ -f testoutput/success ]
         timeout-minutes: ${{ inputs.timeout-minutes }}
       - name: Upload integration test logs

diff --git a/Makefile b/Makefile
@@ -201,7 +201,7 @@ verify: prereqs lint-dashboard lint test
 build: verify compile
 
 .PHONY: all
-all: generate build
+all: docker-generate build
 
 .PHONY: compile compile-cache
 compile:
@@ -216,7 +216,7 @@ debug:
 	CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -mod vendor -gcflags "-N -l" -ldflags="-X '$(BUILDINFO_PKG).Version=$(RELEASE_VERSION)' -X '$(BUILDINFO_PKG).Revision=$(RELEASE_REVISION)'" -a -o bin/$(CMD) $(MAIN_GO_FILE)
 
 .PHONY: dev
-dev: prereqs generate compile-for-coverage
+dev: prereqs docker-generate compile-for-coverage
 
 # Generated binary can provide coverage stats according to https://go.dev/blog/integration-test-coverage
 .PHONY: compile-for-coverage compile-cache-for-coverage
@@ -390,10 +390,6 @@ clean-testoutput:
 	@echo "### Cleaning ${TEST_OUTPUT} folder"
 	rm -rf ${TEST_OUTPUT}/*
 
-.PHONY: check-ebpf-integrity
-check-ebpf-integrity: docker-generate
-	git diff --name-status --exit-code || (echo "Run make docker-generate locally and commit the code changes" && false)
-
 .PHONY: protoc-gen
 protoc-gen:
 	docker run --rm -v $(PWD):/work -w /work $(PROTOC_IMAGE) protoc --go_out=pkg/kubecache --go-grpc_out=pkg/kubecache proto/informer.proto