From 70c6b712d8f3186618ab64b9b5da43f232425a0c Mon Sep 17 00:00:00 2001
From: Manuthor <manu.coste@gmail.com>
Date: Tue, 28 Jan 2025 10:26:39 +0100
Subject: [PATCH] fix: systemd clean + increase timeout when waiting for cert
 generation

---
 .github/workflows/pull_request.yml                          | 6 ++++++
 .../roles/ai_runner/templates/cosmian_ai_runner.service.j2  | 4 ++--
 ansible/roles/check_app/tasks/main.yml                      | 1 +
 ansible/roles/check_cosmian_vm/tasks/main.yml               | 2 ++
 pkg/cosmian_vm_agent.service                                | 2 +-
 pkg/mount_luks.service                                      | 2 +-
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index ea93e1b2..5809ab23 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -6,7 +6,13 @@ on:
 name: Pull request
 
 jobs:
+  cleanup: # we remove the Github cache to avoid any conflict
+    name: Clean Github cache
+    uses: Cosmian/reusable_workflows/.github/workflows/cleanup_cache.yml@main
+    secrets: inherit
+
   build-cosmian-vm-binaries:
+    needs: cleanup
     name: Build binaries
     uses: ./.github/workflows/build_all.yml
 
diff --git a/ansible/roles/ai_runner/templates/cosmian_ai_runner.service.j2 b/ansible/roles/ai_runner/templates/cosmian_ai_runner.service.j2
index b7857710..dc3b6e20 100644
--- a/ansible/roles/ai_runner/templates/cosmian_ai_runner.service.j2
+++ b/ansible/roles/ai_runner/templates/cosmian_ai_runner.service.j2
@@ -1,7 +1,7 @@
 [Unit]
 Description=Cosmian AI Runner
-Requires=multi-user.target
-After=multi-user.target mount_luks.service cosmian_vm_agent.service
+Requires=multi-user.target cosmian_vm_agent.service
+After=multi-user.target cosmian_vm_agent.service
 
 [Service]
 Type=simple
diff --git a/ansible/roles/check_app/tasks/main.yml b/ansible/roles/check_app/tasks/main.yml
index 13b47e21..135c3985 100644
--- a/ansible/roles/check_app/tasks/main.yml
+++ b/ansible/roles/check_app/tasks/main.yml
@@ -32,6 +32,7 @@
   ansible.builtin.wait_for:
     path: /var/lib/cosmian_vm/data/cert.pem
     state: present
+    timeout: 600 # default is 300
 
 - name: Check if port 5555 is listening
   ansible.builtin.wait_for:
diff --git a/ansible/roles/check_cosmian_vm/tasks/main.yml b/ansible/roles/check_cosmian_vm/tasks/main.yml
index d33e3ea6..1b1d4204 100644
--- a/ansible/roles/check_cosmian_vm/tasks/main.yml
+++ b/ansible/roles/check_cosmian_vm/tasks/main.yml
@@ -51,6 +51,7 @@
   ansible.builtin.wait_for:
     path: /var/lib/cosmian_vm/data/cert.pem
     state: present
+    timeout: 600 # default is 300
 
 - name: Display Cosmian VM Agent version
   ansible.builtin.debug:
@@ -203,6 +204,7 @@
       ansible.builtin.wait_for:
         path: /var/lib/cosmian_vm/data/cert.pem
         state: present
+        timeout: 600 # default is 300
 
     - name: Check if port 5555 is listening
       ansible.builtin.wait_for:
diff --git a/pkg/cosmian_vm_agent.service b/pkg/cosmian_vm_agent.service
index 56609248..70185300 100644
--- a/pkg/cosmian_vm_agent.service
+++ b/pkg/cosmian_vm_agent.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Cosmian VM Agent
 Requires=multi-user.target
-After=multi-user.target mount_luks.service dev-tpm0.device
+After=multi-user.target mount_luks.service
 
 [Service]
 Type=simple
diff --git a/pkg/mount_luks.service b/pkg/mount_luks.service
index ce0a2375..3044f602 100644
--- a/pkg/mount_luks.service
+++ b/pkg/mount_luks.service
@@ -4,7 +4,7 @@ Requires=multi-user.target
 After=multi-user.target
 
 [Service]
-Type=oneshot
+Type=exec
 ExecStart=/bin/bash /root/mount_luks.sh
 Restart=on-failure
 RestartSec=10s