Skip to content

Commit bca873b

Browse files
committed
Remove unnecessary build of test executive since deb package of it is upload on build artifacts job
1 parent 87ba719 commit bca873b

File tree

4 files changed

+14
-52
lines changed

4 files changed

+14
-52
lines changed

buildkite/scripts/build-test-executive.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

buildkite/scripts/run-test-executive.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,21 @@ if [[ "${TEST_NAME:0:15}" == "block-prod-prio" ]] && [[ "$RUN_OPT_TESTS" == "" ]
1010
exit 0
1111
fi
1212

13-
./test_executive.exe cloud "$TEST_NAME" \
13+
# Don't prompt for answers during apt-get install
14+
export DEBIAN_FRONTEND=noninteractive
15+
16+
echo "deb [trusted=yes] https://apt.releases.hashicorp.com $MINA_DEB_CODENAME main" | tee /etc/apt/sources.list.d/hashicorp.list
17+
apt-get update
18+
apt-get install -y "terraform"
19+
20+
echo "Installing mina daemon package: mina-test-executive=${MINA_DEB_VERSION}"
21+
echo "deb [trusted=yes] http://packages.o1test.net $MINA_DEB_CODENAME $MINA_DEB_RELEASE" | tee /etc/apt/sources.list.d/mina.list
22+
apt-get update
23+
apt-get install --allow-downgrades -y "mina-test-executive=$MINA_DEB_VERSION" "mina-logproc=$MINA_DEB_VERSION"
24+
25+
mina-test-executive cloud "$TEST_NAME" \
1426
--mina-image "$MINA_IMAGE" \
1527
--archive-image "$ARCHIVE_IMAGE" \
1628
--mina-automation-location ./automation \
1729
| tee "$TEST_NAME.test.log" \
18-
| ./logproc.exe -i inline -f '!(.level in ["Debug", "Spam"])'
30+
| mina-logproc -i inline -f '!(.level in ["Debug", "Spam"])'

buildkite/src/Command/TestExecutive.dhall

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,11 @@ let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type
1515
in
1616

1717
{
18-
build = \(duneProfile : Text) ->
19-
Command.build
20-
Command.Config::{
21-
commands =
22-
-- Build test executive binary
23-
RunInToolchain.runInToolchain [
24-
"DUNE_PROFILE=${duneProfile}"
25-
] "./buildkite/scripts/build-test-executive.sh"
26-
27-
#
28-
29-
[
30-
-- Cache test-executive binary
31-
Cmd.run "artifact-cache-helper.sh test_executive.exe --upload",
32-
Cmd.run "artifact-cache-helper.sh logproc.exe --upload"
33-
],
34-
label = "Build test-executive",
35-
key = "build-test-executive",
36-
target = Size.XLarge
37-
},
38-
3918
execute = \(testName : Text) -> \(dependsOn : List Command.TaggedKey.Type) ->
4019
Command.build
4120
Command.Config::{
4221
commands =
4322
[
44-
-- Download test dependencies
45-
Cmd.run "artifact-cache-helper.sh test_executive.exe && chmod +x test_executive.exe",
46-
Cmd.run "artifact-cache-helper.sh logproc.exe && chmod +x logproc.exe",
47-
4823
-- Execute test based on BUILD image
4924
Cmd.run "MINA_DEB_CODENAME=bullseye ; source ./buildkite/scripts/export-git-env-vars.sh && ./buildkite/scripts/run-test-executive.sh ${testName}"
5025
],
@@ -78,9 +53,6 @@ in
7853
Command.Config::{
7954
commands =
8055
[
81-
-- Download test dependencies
82-
Cmd.run "artifact-cache-helper.sh test_executive.exe && chmod +x test_executive.exe",
83-
Cmd.run "artifact-cache-helper.sh logproc.exe && chmod +x logproc.exe",
8456
Cmd.run "artifact-cache-helper.sh snarkyjs_test.tar.gz && tar -xzf snarkyjs_test.tar.gz",
8557

8658
-- Execute test based on BUILD image

buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ let PipelineMode = ../../Pipeline/Mode.dhall
66
let TestExecutive = ../../Command/TestExecutive.dhall
77

88
let dependsOn = [
9-
{ name = "TestnetIntegrationTests", key = "build-test-executive" },
109
{ name = "MinaArtifactBullseye", key = "daemon-berkeley-bullseye-docker-image" },
1110
{ name = "MinaArtifactBullseye", key = "archive-bullseye-docker-image" }
1211
]
1312
let dependsOnJs = [
14-
{ name = "TestnetIntegrationTests", key = "build-test-executive" },
1513
{ name = "TestnetIntegrationTests", key = "build-js-tests" },
1614
{ name = "MinaArtifactBullseye", key = "daemon-berkeley-bullseye-docker-image" },
1715
{ name = "MinaArtifactBullseye", key = "archive-bullseye-docker-image" }
@@ -33,7 +31,6 @@ in Pipeline.build Pipeline.Config::{
3331
mode = PipelineMode.Type.Stable
3432
},
3533
steps = [
36-
TestExecutive.build "integration_tests",
3734
TestExecutive.buildJs "integration_tests",
3835
TestExecutive.execute "peers-reliability" dependsOn,
3936
TestExecutive.execute "chain-reliability" dependsOn,

0 commit comments

Comments
 (0)