From b599705213ab8599bac4db537929c63c7f16dfdf Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Tue, 4 Feb 2025 15:46:03 +0100
Subject: [PATCH] CI: Remove useless [eval $opam env)] in tezt jobs

---
 .gitlab/ci/pipelines/before_merging.yml                    | 6 ------
 .gitlab/ci/pipelines/merge_train.yml                       | 6 ------
 .gitlab/ci/pipelines/schedule_extended_rpc_test.yml        | 6 ------
 .gitlab/ci/pipelines/schedule_extended_test.yml            | 6 ------
 .gitlab/ci/pipelines/schedule_extended_validation_test.yml | 6 ------
 ci/bin/common.ml                                           | 2 +-
 6 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml
index 2691a631dcbb..3661c265b835 100644
--- a/.gitlab/ci/pipelines/before_merging.yml
+++ b/.gitlab/ci/pipelines/before_merging.yml
@@ -4092,7 +4092,6 @@ tezt:
   timeout: 40 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -4181,7 +4180,6 @@ tezt-memory-3k:
   timeout: 60 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -4270,7 +4268,6 @@ tezt-memory-4k:
   timeout: 60 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -4359,7 +4356,6 @@ tezt-time-sensitive:
   timeout: 60 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -4448,7 +4444,6 @@ tezt-slow:
   timeout: 60 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -4535,7 +4530,6 @@ tezt-flaky:
   timeout: 60 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml
index 41642d8bc82c..ba3da7b05c62 100644
--- a/.gitlab/ci/pipelines/merge_train.yml
+++ b/.gitlab/ci/pipelines/merge_train.yml
@@ -4091,7 +4091,6 @@ tezt:
   timeout: 40 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -4180,7 +4179,6 @@ tezt-memory-3k:
   timeout: 60 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -4269,7 +4267,6 @@ tezt-memory-4k:
   timeout: 60 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -4358,7 +4355,6 @@ tezt-time-sensitive:
   timeout: 60 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -4447,7 +4443,6 @@ tezt-slow:
   timeout: 60 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -4534,7 +4529,6 @@ tezt-flaky:
   timeout: 60 minutes
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
diff --git a/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml b/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml
index b4e54e0ea4b1..c1b32d789eb1 100644
--- a/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml
+++ b/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml
@@ -67,7 +67,6 @@ tezt:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -121,7 +120,6 @@ tezt-memory-3k:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -175,7 +173,6 @@ tezt-memory-4k:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -229,7 +226,6 @@ tezt-time-sensitive:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -282,7 +278,6 @@ tezt-slow:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -337,7 +332,6 @@ tezt-flaky:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml
index 607d944601d2..070235eac8fd 100644
--- a/.gitlab/ci/pipelines/schedule_extended_test.yml
+++ b/.gitlab/ci/pipelines/schedule_extended_test.yml
@@ -2795,7 +2795,6 @@ tezt:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -2857,7 +2856,6 @@ tezt-memory-3k:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -2919,7 +2917,6 @@ tezt-memory-4k:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -2981,7 +2978,6 @@ tezt-time-sensitive:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -3042,7 +3038,6 @@ tezt-slow:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -3101,7 +3096,6 @@ tezt-flaky:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
diff --git a/.gitlab/ci/pipelines/schedule_extended_validation_test.yml b/.gitlab/ci/pipelines/schedule_extended_validation_test.yml
index b4e54e0ea4b1..c1b32d789eb1 100644
--- a/.gitlab/ci/pipelines/schedule_extended_validation_test.yml
+++ b/.gitlab/ci/pipelines/schedule_extended_validation_test.yml
@@ -67,7 +67,6 @@ tezt:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -121,7 +120,6 @@ tezt-memory-3k:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -175,7 +173,6 @@ tezt-memory-4k:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -229,7 +226,6 @@ tezt-time-sensitive:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -282,7 +278,6 @@ tezt-slow:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
@@ -337,7 +332,6 @@ tezt-flaky:
   interruptible: false
   before_script:
   - . ./scripts/version.sh
-  - eval $(opam env)
   script:
   - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\"
     CI_NODE_TOTAL=\"${CI_NODE_TOTAL}\" TEZT_PARALLEL=\"${TEZT_PARALLEL}\" TEZT_VARIANT=\"${TEZT_VARIANT}\""
diff --git a/ci/bin/common.ml b/ci/bin/common.ml
index df856a43809e..33e9418f593b 100644
--- a/ci/bin/common.ml
+++ b/ci/bin/common.ml
@@ -1065,7 +1065,7 @@ module Tezt = struct
   let job ~__POS__ ?rules ?parallel ?(tag = Gcp_tezt) ~name
       ~(tezt_tests : Tezt_core.TSL_AST.t) ?(retry = 2) ?(tezt_retry = 1)
       ?(tezt_parallel = 1) ?(tezt_variant = "")
-      ?(before_script = before_script ~source_version:true ~eval_opam:true [])
+      ?(before_script = before_script ~source_version:true ~eval_opam:false [])
       ?timeout ?job_select_tezts ~dependencies ?allow_failure () : tezos_job =
     let variables =
       [
-- 
GitLab