Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplicated build for Lucy in CI #14267

Merged
merged 3 commits into from
Oct 6, 2023
Merged

Remove duplicated build for Lucy in CI #14267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bca873b
Remove unnecessary build of test executive since deb package of it is…
dkijania Oct 4, 2023
95f20b8
remove unnecessary dependency
dkijania Oct 5, 2023
1794451
Merge branch 'berkeley' into dkijania/do_not_build_te_again
dkijania Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions buildkite/scripts/build-test-executive.sh
View file
Open in desktop

This file was deleted.

16 changes: 14 additions & 2 deletions buildkite/scripts/run-test-executive.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"])'
28 changes: 0 additions & 28 deletions buildkite/src/Command/TestExecutive.dhall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
],
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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,
Expand Down
1 change: 0 additions & 1 deletion buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
]
Expand Down