Skip to content

Commit c86c6af

Browse files
authored
Merge pull request #17999 from MinaProtocol/dkijania/support_archives_in_postgres_tests
[CI] support for untaring script in Run with postgres test
2 parents 4ecdbc9 + 2f1aca6 commit c86c6af

File tree

5 files changed

+45
-15
lines changed

5 files changed

+45
-15
lines changed

buildkite/src/Command/ArchiveNodeTest.dhall

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ in { step =
1919
[ "ARCHIVE_TEST_APP=mina-archive-node-test"
2020
, "MINA_TEST_NETWORK_DATA=/etc/mina/test/archive/sample_db"
2121
]
22-
"src/test/archive/sample_db/archive_db.sql"
22+
( RunWithPostgres.ScriptOrArchive.Script
23+
"src/test/archive/sample_db/archive_db.sql"
24+
)
2325
( Artifacts.fullDockerTag
2426
Artifacts.Tag::{
2527
, artifact = Artifacts.Type.FunctionalTestSuite

buildkite/src/Command/PatchArchiveTest.dhall

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ in { step =
1919
[ "PATCH_ARCHIVE_TEST_APP=mina-patch-archive-test"
2020
, "NETWORK_DATA_FOLDER=/etc/mina/test/archive/sample_db"
2121
]
22-
"./src/test/archive/sample_db/archive_db.sql"
22+
( RunWithPostgres.ScriptOrArchive.Script
23+
"./src/test/archive/sample_db/archive_db.sql"
24+
)
2325
( Artifacts.fullDockerTag
2426
Artifacts.Tag::{
2527
, artifact = Artifacts.Type.FunctionalTestSuite

buildkite/src/Command/ReplayerTest.dhall

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ in { step =
1717
, commands =
1818
[ RunWithPostgres.runInDockerWithPostgresConn
1919
([] : List Text)
20-
"./src/test/archive/sample_db/archive_db.sql"
20+
( RunWithPostgres.ScriptOrArchive.Script
21+
"./src/test/archive/sample_db/archive_db.sql"
22+
)
2123
( Artifacts.fullDockerTag
2224
Artifacts.Tag::{
2325
, artifact = Artifacts.Type.FunctionalTestSuite

buildkite/src/Command/RunWithPostgres.dhall

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,14 @@ let Cmd = ../Lib/Cmds.dhall
5757

5858
let ContainerImages = ../Constants/ContainerImages.dhall
5959

60+
let ScriptOrArchive
61+
: Type
62+
= < Script : Text | Archive : { Script : Text, Archive : Text } >
63+
6064
let runInDockerWithPostgresConn
61-
: List Text -> Text -> Text -> Text -> Cmd.Type
65+
: List Text -> ScriptOrArchive -> Text -> Text -> Cmd.Type
6266
= \(environment : List Text)
63-
-> \(initScript : Text)
67+
-> \(initScript : ScriptOrArchive)
6468
-> \(docker : Text)
6569
-> \(innerScript : Text)
6670
-> let port = "5432"
@@ -97,13 +101,31 @@ let runInDockerWithPostgresConn
97101
: Text
98102
= "\\\$BUILDKITE_BUILD_CHECKOUT_PATH"
99103

104+
let runInitScript =
105+
merge
106+
{ Script =
107+
\(script : Text)
108+
-> [ "docker exec ${postgresDockerName} psql ${pg_conn} -f /workdir/${script}"
109+
]
110+
, Archive =
111+
\(archive : { Script : Text, Archive : Text })
112+
-> [ "tar -xzf ${archive.Archive}"
113+
, "docker exec ${postgresDockerName} find /workdir -name \"${archive.Script}\" -exec psql ${pg_conn} -f {} \\;"
114+
]
115+
}
116+
initScript
117+
100118
in Cmd.chain
101-
[ "( docker stop ${postgresDockerName} && docker rm ${postgresDockerName} ) || true"
102-
, "source buildkite/scripts/export-git-env-vars.sh"
103-
, "docker run --network host --volume ${outerDir}:/workdir --workdir /workdir --name ${postgresDockerName} -d -e POSTGRES_USER=${user} -e POSTGRES_PASSWORD=${password} -e POSTGRES_PASSWORD=${password} -e POSTGRES_DB=${dbName} ${dockerVersion}"
104-
, "sleep 5"
105-
, "docker exec ${postgresDockerName} psql ${pg_conn} -f /workdir/${initScript}"
106-
, "docker run --pid=container:postgres --network host --volume ${outerDir}:/workdir --workdir /workdir --entrypoint bash ${envVars} ${docker} ${innerScript}"
107-
]
108-
109-
in { runInDockerWithPostgresConn = runInDockerWithPostgresConn }
119+
( [ "( docker stop ${postgresDockerName} && docker rm ${postgresDockerName} ) || true"
120+
, "source buildkite/scripts/export-git-env-vars.sh"
121+
, "docker run --network host --volume ${outerDir}:/workdir --workdir /workdir --name ${postgresDockerName} -d -e POSTGRES_USER=${user} -e POSTGRES_PASSWORD=${password} -e POSTGRES_DB=${dbName} ${dockerVersion}"
122+
, "sleep 5"
123+
]
124+
# runInitScript
125+
# [ "docker run --pid=container:postgres --network host --volume ${outerDir}:/workdir --workdir /workdir --entrypoint bash ${envVars} ${docker} ${innerScript}"
126+
]
127+
)
128+
129+
in { runInDockerWithPostgresConn = runInDockerWithPostgresConn
130+
, ScriptOrArchive = ScriptOrArchive
131+
}

buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ in Pipeline.build
5454
"export MINA_DEB_CODENAME=bullseye && source ./buildkite/scripts/export-git-env-vars.sh && echo \\\${MINA_DOCKER_TAG}"
5555
, RunWithPostgres.runInDockerWithPostgresConn
5656
([] : List Text)
57-
"./src/test/archive/sample_db/archive_db.sql"
57+
( RunWithPostgres.ScriptOrArchive.Script
58+
"./src/test/archive/sample_db/archive_db.sql"
59+
)
5860
rosettaDocker
5961
"./buildkite/scripts/rosetta-indexer-test.sh"
6062
, Cmd.runInDocker

0 commit comments

Comments
 (0)