diff --git a/.mocharc.json b/.mocharc.json index d112cdf..1dff619 100644 --- a/.mocharc.json +++ b/.mocharc.json @@ -2,5 +2,5 @@ "extension": ["ts"], "spec": "itest/**/*.ts", "require": ["ts-node/register"], - "timeout": 300000 - } \ No newline at end of file + "timeout": 600000 +} diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest index c06762c..8edcc45 100644 --- a/Jenkinsfile-itest +++ b/Jenkinsfile-itest @@ -18,7 +18,7 @@ node('docker') { docker.image('node:22-alpine') .inside('-v /var/run/docker.sock:/var/run/docker.sock --network=host --user=root') { stage('Init') { - sh 'apk add docker docker-compose' // TODO: Use already built image for a faster job + sh 'apk add docker docker-compose' // TODO: Use already built image for a faster job execution sh 'npm ci' } stage('Integration tests') { diff --git a/docker/Dockerfile b/docker/Dockerfile index 55cee5b..d38081c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,13 +1,9 @@ FROM node:22 - WORKDIR /iexec-poco-subgraph - COPY package*.json . COPY schema.graphql . COPY subgraph.template.yaml . COPY networks.json . COPY src src - RUN npm ci - ENTRYPOINT [ "npm", "run", "deploy:all" ] diff --git a/docker/test/docker-compose.yml b/docker/test/docker-compose.yml index 5f9d702..afb602f 100644 --- a/docker/test/docker-compose.yml +++ b/docker/test/docker-compose.yml @@ -7,7 +7,7 @@ services: # - 8546 ports: - 8545:8545 - # - 8546:8546 # port (not required for integrations tests) fails to open on CI + # - 8546:8546 # port (not required for integration tests) fails to open on CI ipfs: restart: unless-stopped diff --git a/itest/integration.test.ts b/itest/integration.test.ts index 20fe62e..c9fd274 100644 --- a/itest/integration.test.ts +++ b/itest/integration.test.ts @@ -13,7 +13,7 @@ const client = new ApolloClient({ describe('Integration tests', () => { /** * Services are started only once before running all tests to get a decent test - * time in case of multiple tests. Please switch to `beforeEach` if necessary. + * suite duration with multiple tests. Please switch to `beforeEach` if necessary. * Shutdown of services is handled by `testcontainers` framework. */ before(async () => { diff --git a/networks.json b/networks.json index 22165a8..9497c64 100644 --- a/networks.json +++ b/networks.json @@ -43,4 +43,4 @@ "startBlock": 4543300 } } -} \ No newline at end of file +}