Skip to content

Commit

Permalink
Use new configs in integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Deniallugo committed Dec 29, 2020
1 parent db17250 commit 3876957
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
!docker/exit-tool/configs
!docker/keybase-secrets/entrypoint.sh
!docker/ci-integration-test/entrypoint.sh
!etc/env/dev.env.example
!etc/env/base/
!etc/tokens
!keys/packed
!docker/nginx/nginx.conf
Expand Down
1 change: 1 addition & 0 deletions docker/ci-integration-test/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ service postgresql restart
zk dummy-prover enable --no-redeploy

# Initialize the stack
zk config compile
zk run verify-keys unpack
zk run yarn || true # It can fail
zk db setup
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/zk/src/test/integration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export async function inDocker(command: string, timeout: number) {
timer.unref();

const volume = `${process.env.ZKSYNC_HOME}:/usr/src/zksync`;
const image = `matterlabs/ci-integration-test:latest`;
const image = `matterlabs/ci-integration-test:zk-latest`;
await utils.spawn(
`docker run -v ${volume} ${image} bash -c "/usr/local/bin/entrypoint.sh && ${command} || zk run cat-logs 1"`
);
Expand Down

0 comments on commit 3876957

Please sign in to comment.