From d1aec76ab5236e55e5bbbe1bd0bf6ef832354512 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Fri, 28 Feb 2025 09:29:45 +0100
Subject: [PATCH] CI, Teztale: Change artefacts path

---
 .gitlab/ci/pipelines/before_merging.yml         |  8 ++++++--
 .gitlab/ci/pipelines/merge_train.yml            |  8 ++++++--
 .gitlab/ci/pipelines/octez_monitoring.yml       | 10 ++++++++--
 .gitlab/ci/pipelines/schedule_extended_test.yml |  8 ++++++--
 teztale/ci/teztale.ml                           |  7 ++++++-
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml
index 3429cc7aee3e..b581ec9dcdbc 100644
--- a/.gitlab/ci/pipelines/before_merging.yml
+++ b/.gitlab/ci/pipelines/before_merging.yml
@@ -1349,6 +1349,8 @@ teztale.build:static-x86_64:
   script:
   - make teztale
   after_script:
+  - mkdir -p ./teztale-binaries/x86_64
+  - mv octez-teztale-* ./teztale-binaries/x86_64/
   - ./scripts/ci/sccache-stop.sh
   variables:
     PROFILE: static
@@ -1359,7 +1361,7 @@ teztale.build:static-x86_64:
     name: teztale-binaries
     expire_in: 1 day
     paths:
-    - octez-teztale-*
+    - teztale-binaries/x86_64/octez-teztale-*
     when: on_success
 
 teztale.build:static-arm64:
@@ -1393,6 +1395,8 @@ teztale.build:static-arm64:
   script:
   - make teztale
   after_script:
+  - mkdir -p ./teztale-binaries/arm64
+  - mv octez-teztale-* ./teztale-binaries/arm64/
   - ./scripts/ci/sccache-stop.sh
   variables:
     PROFILE: static
@@ -1403,7 +1407,7 @@ teztale.build:static-arm64:
     name: teztale-binaries
     expire_in: 1 day
     paths:
-    - octez-teztale-*
+    - teztale-binaries/arm64/octez-teztale-*
     when: on_success
 
 etherlink.build:static-x86_64:
diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml
index c18c33af87b8..b546128aa683 100644
--- a/.gitlab/ci/pipelines/merge_train.yml
+++ b/.gitlab/ci/pipelines/merge_train.yml
@@ -1348,6 +1348,8 @@ teztale.build:static-x86_64:
   script:
   - make teztale
   after_script:
+  - mkdir -p ./teztale-binaries/x86_64
+  - mv octez-teztale-* ./teztale-binaries/x86_64/
   - ./scripts/ci/sccache-stop.sh
   variables:
     PROFILE: static
@@ -1358,7 +1360,7 @@ teztale.build:static-x86_64:
     name: teztale-binaries
     expire_in: 1 day
     paths:
-    - octez-teztale-*
+    - teztale-binaries/x86_64/octez-teztale-*
     when: on_success
 
 teztale.build:static-arm64:
@@ -1392,6 +1394,8 @@ teztale.build:static-arm64:
   script:
   - make teztale
   after_script:
+  - mkdir -p ./teztale-binaries/arm64
+  - mv octez-teztale-* ./teztale-binaries/arm64/
   - ./scripts/ci/sccache-stop.sh
   variables:
     PROFILE: static
@@ -1402,7 +1406,7 @@ teztale.build:static-arm64:
     name: teztale-binaries
     expire_in: 1 day
     paths:
-    - octez-teztale-*
+    - teztale-binaries/arm64/octez-teztale-*
     when: on_success
 
 etherlink.build:static-x86_64:
diff --git a/.gitlab/ci/pipelines/octez_monitoring.yml b/.gitlab/ci/pipelines/octez_monitoring.yml
index e39a976460d5..38bfab2a751d 100644
--- a/.gitlab/ci/pipelines/octez_monitoring.yml
+++ b/.gitlab/ci/pipelines/octez_monitoring.yml
@@ -166,13 +166,16 @@ teztale.build:static-arm64:
   - eval $(opam env)
   script:
   - make teztale
+  after_script:
+  - mkdir -p ./teztale-binaries/arm64
+  - mv octez-teztale-* ./teztale-binaries/arm64/
   variables:
     PROFILE: static
   artifacts:
     name: teztale-binaries
     expire_in: never
     paths:
-    - octez-teztale-*
+    - teztale-binaries/arm64/octez-teztale-*
     when: on_success
 
 teztale.build:static-x86_64:
@@ -189,11 +192,14 @@ teztale.build:static-x86_64:
   - eval $(opam env)
   script:
   - make teztale
+  after_script:
+  - mkdir -p ./teztale-binaries/x86_64
+  - mv octez-teztale-* ./teztale-binaries/x86_64/
   variables:
     PROFILE: static
   artifacts:
     name: teztale-binaries
     expire_in: never
     paths:
-    - octez-teztale-*
+    - teztale-binaries/x86_64/octez-teztale-*
     when: on_success
diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml
index f640de40b44f..8677afc84709 100644
--- a/.gitlab/ci/pipelines/schedule_extended_test.yml
+++ b/.gitlab/ci/pipelines/schedule_extended_test.yml
@@ -905,6 +905,8 @@ teztale.build:static-x86_64:
   script:
   - make teztale
   after_script:
+  - mkdir -p ./teztale-binaries/x86_64
+  - mv octez-teztale-* ./teztale-binaries/x86_64/
   - ./scripts/ci/sccache-stop.sh
   variables:
     PROFILE: static
@@ -915,7 +917,7 @@ teztale.build:static-x86_64:
     name: teztale-binaries
     expire_in: 1 day
     paths:
-    - octez-teztale-*
+    - teztale-binaries/x86_64/octez-teztale-*
     when: on_success
 
 teztale.build:static-arm64:
@@ -946,6 +948,8 @@ teztale.build:static-arm64:
   script:
   - make teztale
   after_script:
+  - mkdir -p ./teztale-binaries/arm64
+  - mv octez-teztale-* ./teztale-binaries/arm64/
   - ./scripts/ci/sccache-stop.sh
   variables:
     PROFILE: static
@@ -956,7 +960,7 @@ teztale.build:static-arm64:
     name: teztale-binaries
     expire_in: 1 day
     paths:
-    - octez-teztale-*
+    - teztale-binaries/arm64/octez-teztale-*
     when: on_success
 
 etherlink.build:static-x86_64:
diff --git a/teztale/ci/teztale.ml b/teztale/ci/teztale.ml
index 23489824cd86..d11b11f8011c 100644
--- a/teztale/ci/teztale.ml
+++ b/teztale/ci/teztale.ml
@@ -29,11 +29,16 @@ let job_build ?rules ?(expire_in = Gitlab_ci.Types.(Duration (Days 1))) ~arch ()
          ~name:"teztale-binaries"
          ~expire_in
          ~when_:On_success
-         ["octez-teztale-*"])
+         ["teztale-binaries/" ^ arch_string ^ "/octez-teztale-*"])
     ~before_script:
       [
         "./scripts/ci/take_ownership.sh";
         ". ./scripts/version.sh";
         "eval $(opam env)";
       ]
+    ~after_script:
+      [
+        "mkdir -p ./teztale-binaries/" ^ arch_string;
+        "mv octez-teztale-* ./teztale-binaries/" ^ arch_string ^ "/";
+      ]
     ["make teztale"]
-- 
GitLab