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

integration not working #681

Merged
merged 3 commits into from
Aug 7, 2024
Merged

integration not working #681

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
0d08e25
integration not working
scx1332 Aug 6, 2024
5b01411
integration not working
scx1332 Aug 6, 2024
bdb80a0
integration not working
scx1332 Aug 7, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
integration-test:
name: Run integration tests
runs-on: [ubuntu-latest]
runs-on: [ubuntu-22.04]

strategy:
matrix:
Expand Down
6 changes: 3 additions & 3 deletions goth/default-assets/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ services:
- "host.docker.internal:host-gateway"

ethereum-mainnet:
image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:77ce4d49def1
image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:4c020aca5a0d
environment:
- GANACHE_CHAIN_ID=1

ethereum-holesky:
image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:77ce4d49def1
image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:4c020aca5a0d
environment:
- GANACHE_CHAIN_ID=17000

ethereum-polygon:
image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:77ce4d49def1
image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:4c020aca5a0d
environment:
- GANACHE_CHAIN_ID=137

Expand Down
5 changes: 3 additions & 2 deletions goth/runner/container/compose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ async def start_network(
# Stop the network in case it's already running (e.g. from a previous test)
await self.stop_network()

command = ["docker-compose", "-f", str(self.config.file_path), "up", "-d"]
command = ["docker", "compose", "-f", str(self.config.file_path), "up", "-d"]

await build_yagna_image(self.config.build_env)
await build_proxy_image(self.config.build_env.docker_dir)
Expand Down Expand Up @@ -186,7 +186,8 @@ async def stop_network(self, compose_containers: Optional[List[str]] = None):
self._disconnect_containers(compose_containers or [])

compose_down_cmd = [
"docker-compose",
"docker",
"compose",
"-f",
str(self.config.file_path),
"down",
Expand Down