Merge pull request #14290 from MinaProtocol/dkijania/do_not_build_te_…

…again_dev [Dev] Do not build lucy twice
MinaProtocol · Oct 10, 2023 · 2d42735 · 2d42735
2 parents 9e52acf + 2cbb035
commit 2d42735
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 53 deletions.
diff --git a/buildkite/scripts/build-test-executive.sh b/buildkite/scripts/build-test-executive.sh
diff --git a/buildkite/scripts/run-test-executive.sh b/buildkite/scripts/run-test-executive.sh
@@ -10,9 +10,21 @@ if [[ "${TEST_NAME:0:15}" == "block-prod-prio" ]] && [[ "$RUN_OPT_TESTS" == "" ]
   exit 0
 fi
 
-./test_executive.exe cloud "$TEST_NAME" \
+# Don't prompt for answers during apt-get install
+export DEBIAN_FRONTEND=noninteractive
+
+echo "deb [trusted=yes] https://apt.releases.hashicorp.com $MINA_DEB_CODENAME main" | tee /etc/apt/sources.list.d/hashicorp.list
+apt-get update
+apt-get install -y "terraform"
+
+echo "Installing mina daemon package: mina-test-executive=${MINA_DEB_VERSION}"
+echo "deb [trusted=yes] http://packages.o1test.net $MINA_DEB_CODENAME $MINA_DEB_RELEASE" | tee /etc/apt/sources.list.d/mina.list
+apt-get update
+apt-get install --allow-downgrades -y "mina-test-executive=$MINA_DEB_VERSION" "mina-logproc=$MINA_DEB_VERSION"
+
+mina-test-executive cloud "$TEST_NAME" \
   --mina-image "$MINA_IMAGE" \
   --archive-image "$ARCHIVE_IMAGE" \
   --mina-automation-location ./automation \
   | tee "$TEST_NAME.test.log" \
-  | ./logproc.exe -i inline -f '!(.level in ["Debug", "Spam"])'
+  | mina-logproc -i inline -f '!(.level in ["Debug", "Spam"])'
diff --git a/buildkite/src/Command/TestExecutive.dhall b/buildkite/src/Command/TestExecutive.dhall
@@ -15,36 +15,11 @@ let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type
 in
 
 {
-  build = \(duneProfile : Text) ->
-    Command.build
-      Command.Config::{
-        commands =
-            -- Build test executive binary
-            RunInToolchain.runInToolchain [
-              "DUNE_PROFILE=${duneProfile}"
-            ] "./buildkite/scripts/build-test-executive.sh"
-
-            #
-
-            [
-              -- Cache test-executive binary
-              Cmd.run "artifact-cache-helper.sh test_executive.exe --upload",
-              Cmd.run "artifact-cache-helper.sh logproc.exe --upload"
-            ],
-        label = "Build test-executive",
-        key = "build-test-executive",
-        target = Size.XLarge
-      },
-
   execute = \(testName : Text) -> \(dependsOn : List Command.TaggedKey.Type) ->
     Command.build
       Command.Config::{
         commands =
             [
-              -- Download test dependencies
-              Cmd.run "artifact-cache-helper.sh test_executive.exe && chmod +x test_executive.exe",
-              Cmd.run "artifact-cache-helper.sh logproc.exe && chmod +x logproc.exe",
-
               -- Execute test based on BUILD image
               Cmd.run "MINA_DEB_CODENAME=bullseye ; source ./buildkite/scripts/export-git-env-vars.sh && ./buildkite/scripts/run-test-executive.sh ${testName}"
             ],
@@ -78,9 +53,6 @@ in
       Command.Config::{
         commands =
             [
-              -- Download test dependencies
-              Cmd.run "artifact-cache-helper.sh test_executive.exe && chmod +x test_executive.exe",
-              Cmd.run "artifact-cache-helper.sh logproc.exe && chmod +x logproc.exe",
               Cmd.run "artifact-cache-helper.sh snarkyjs_test.tar.gz && tar -xzf snarkyjs_test.tar.gz",
 
               -- Execute test based on BUILD image

diff --git a/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall b/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall
@@ -6,12 +6,10 @@ let PipelineMode = ../../Pipeline/Mode.dhall
 let TestExecutive = ../../Command/TestExecutive.dhall
 
 let dependsOn = [
-    { name = "TestnetIntegrationTests", key = "build-test-executive" },
     { name = "MinaArtifactBullseye", key = "daemon-berkeley-bullseye-docker-image" },
     { name = "MinaArtifactBullseye", key = "archive-bullseye-docker-image" }
 ]
 let dependsOnJs = [
-    { name = "TestnetIntegrationTests", key = "build-test-executive" },
     { name = "TestnetIntegrationTests", key = "build-js-tests" },
     { name = "MinaArtifactBullseye", key = "daemon-berkeley-bullseye-docker-image" },
     { name = "MinaArtifactBullseye", key = "archive-bullseye-docker-image" }
@@ -33,7 +31,6 @@ in Pipeline.build Pipeline.Config::{
     mode = PipelineMode.Type.Stable
   },
   steps = [
-    TestExecutive.build "integration_tests",
     TestExecutive.buildJs "integration_tests",
     TestExecutive.execute "peers-reliability" dependsOn,
     TestExecutive.execute "chain-reliability" dependsOn,

diff --git a/buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall b/buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall
@@ -6,7 +6,6 @@ let PipelineMode = ../../Pipeline/Mode.dhall
 let TestExecutive = ../../Command/TestExecutive.dhall
 
 let dependsOn = [
-    { name = "TestnetIntegrationTests", key = "build-test-executive" },
     { name = "MinaArtifactBullseye", key = "daemon-berkeley-bullseye-docker-image" },
     { name = "MinaArtifactBullseye", key = "archive-bullseye-docker-image" }
 ]