From 430b4bafbc4a88070dc0916c38fca078f2b38381 Mon Sep 17 00:00:00 2001
From: blotus <sebastien@crowdsec.net>
Date: Tue, 20 Apr 2021 11:07:13 +0200
Subject: [PATCH] Update CI (#760)

* Force machine-id when running tests

* Use the source branch instead of master when dispatching to packaging repo
---
 .github/workflows/ci_functests-install.yml  | 4 ++++
 .github/workflows/dispatch_test_debpkg.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci_functests-install.yml b/.github/workflows/ci_functests-install.yml
index 4edf75f00..bc3c097c1 100644
--- a/.github/workflows/ci_functests-install.yml
+++ b/.github/workflows/ci_functests-install.yml
@@ -28,6 +28,10 @@ jobs:
         excludes: draft
     - name: Build release
       run: BUILD_VERSION=${{ steps.keydb.outputs.release }} make release
+    - name: "Force machineid"
+      run: |
+          sudo chmod +w /etc/machine-id
+          echo githubciXXXXXXXXXXXXXXXXXXXXXXXX | sudo tee /etc/machine-id
     - name: Install release
       run: |
         cd crowdsec-${{ steps.keydb.outputs.release }}
diff --git a/.github/workflows/dispatch_test_debpkg.yaml b/.github/workflows/dispatch_test_debpkg.yaml
index 4042d7196..89539e503 100644
--- a/.github/workflows/dispatch_test_debpkg.yaml
+++ b/.github/workflows/dispatch_test_debpkg.yaml
@@ -17,4 +17,4 @@ jobs:
           token: ${{ secrets.DISPATCH_TOKEN }}
           event-type: test_package_from_master
           repository: crowdsecurity/packaging
-          client-payload: '{"branch": "master"}'
+          client-payload: '{"branch": "${{ github.ref }}"}'