ci: fix deployment with new action (#291)

aneoconsulting · Aug 29, 2024 · 63e96ff · 63e96ff
2 parents 924b32e + 313a35c
commit 63e96ff
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,9 @@ on:
       - "[0-9]+.[0-9]+.x"
   pull_request:
 
+env:
+  ARMONIK_SHARED_HOST_PATH: ${{ github.workspace }}/infra/infrastructure/quick-deploy/localhost/all-in-one/data/
+
 jobs:
   versionning:
     name: Versionning
@@ -142,6 +145,8 @@ jobs:
           mtls: ${{ matrix.mtls }}
           ext-csharp-version: ${{ needs.versionning.outputs.version }}
           core-version: 0.24.2
+          shared-data-folder: ${{ env.ARMONIK_SHARED_HOST_PATH }}
+          log-suffix: end2end-${{ matrix.tls }}-${{ matrix.mtls }}-${{ matrix.sslvalidation }}-${{ matrix.useca }}
 
       - name: Setup hosts file
         run : echo -e "$(kubectl get svc ingress -n armonik -o jsonpath={.status.loadBalancer.ingress[0].ip})\tarmonik.local" | sudo tee -a /etc/hosts
@@ -266,6 +271,8 @@ jobs:
           type: localhost
           ext-csharp-version: ${{ needs.versionning.outputs.version }}
           core-version: 0.24.2
+          shared-data-folder: ${{ env.ARMONIK_SHARED_HOST_PATH }}
+          log-suffix: container
 
       - name: Run Test
         timeout-minutes: 20

diff --git a/tools/parameters.tfvars b/tools/parameters.tfvars
@@ -274,25 +274,37 @@ ingress = {
   generate_client_cert = false
 }
 
-extra_conf = {
+configurations = {
   core = {
-    Amqp__AllowHostMismatch                    = true
-    Amqp__MaxPriority                          = "10"
-    Amqp__MaxRetries                           = "5"
-    Amqp__QueueStorage__LockRefreshPeriodicity = "00:00:45"
-    Amqp__QueueStorage__PollPeriodicity        = "00:00:10"
-    Amqp__QueueStorage__LockRefreshExtension   = "00:02:00"
-    MongoDB__TableStorage__PollingDelayMin     = "00:00:01"
-    MongoDB__TableStorage__PollingDelayMax     = "00:00:10"
-    MongoDB__AllowInsecureTls                  = true
-    MongoDB__TableStorage__PollingDelay        = "00:00:01"
-    MongoDB__DataRetention                     = "10.00:00:00"
-    Redis__Timeout                             = 30000
-    Redis__SslHost                             = "127.0.0.1"
+    env = {
+      Amqp__AllowHostMismatch                    = true
+      Amqp__MaxPriority                          = "10"
+      Amqp__MaxRetries                           = "5"
+      Amqp__QueueStorage__LockRefreshPeriodicity = "00:00:45"
+      Amqp__QueueStorage__PollPeriodicity        = "00:00:10"
+      Amqp__QueueStorage__LockRefreshExtension   = "00:02:00"
+      MongoDB__TableStorage__PollingDelayMin     = "00:00:01"
+      MongoDB__TableStorage__PollingDelayMax     = "00:00:10"
+      MongoDB__AllowInsecureTls                  = true
+      MongoDB__TableStorage__PollingDelay        = "00:00:01"
+      MongoDB__DataRetention                     = "1.00:00:00"
+      Redis__Timeout                             = 30000
+      Redis__SslHost                             = "127.0.0.1"
+      Redis__TtlTimeSpan                         = "1.00:00:00"
+      Submitter__DeletePayload                   = true
+    }
   }
   control = {
-    Submitter__MaxErrorAllowed = 50
+    env = {
+      Submitter__MaxErrorAllowed = 50
+    }
   }
+  worker = {
+    env = {
+      target_zip_path = "/tmp"
+    }
+  }
+  jobs = { env = { MongoDB__DataRetention = "1.00:00:00" } }
 }
 
 environment_description = {
@@ -301,3 +313,7 @@ environment_description = {
   description = "Local development environment"
   color       = "blue"
 }
+
+static = {
+  gui_configuration = {}
+}