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

[WIP] chore(): Make E2E tests run with SMPCv2 #877

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[WIP] chore(): Make E2E tests run with SMPCv2 #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b64c8f
step
wojciechsromek Jan 3, 2025
03de5d4
correct command in mpc-0 node and add latest tag
wojciechsromek Jan 3, 2025
9b2dee3
remove debug, adjust config
wojciechsromek Jan 3, 2025
27a8b4e
a lot of initial heartbeats
wojciechsromek Jan 7, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/build-and-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }},
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
platforms: linux/amd64
cache-from: type=gha
cache-to: type=gha,mode=max
18 changes: 14 additions & 4 deletions deploy/e2e/iris-mpc-0.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ iris-mpc-0:
- name: AWS_REGION
value: "$AWS_REGION"

- name: AWS_ACCESS_KEY_ID
value: "access_key"

- name: AWS_SECRET_ACCESS_KEY
value: "secret_key"

- name: AWS_ENDPOINT_URL
value: "http://localstack:4566"

Expand All @@ -103,7 +109,7 @@ iris-mpc-0:
value: "eth0"

- name: NCCL_COMM_ID
value: "iris-mpc-0.svc.cluster.local:4000"
value: "iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local:4000"

- name: SMPC__ENVIRONMENT
value: "$ENV"
Expand Down Expand Up @@ -189,14 +195,17 @@ iris-mpc-0:
value: "true"

- name: SMPC__NODE_HOSTNAMES
value: '["iris-mpc-0.svc.cluster.local","iris-mpc-1.svc.cluster.local","iris-mpc-2.svc.cluster.local"]'
value: '["iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local","iris-mpc-1.iris-mpc-1.$ENV.svc.cluster.local","iris-mpc-2.iris-mpc-2.$ENV.svc.cluster.local"]'

- name: SMPC__IMAGE_NAME
value: "ghcr.io/worldcoin/iris-mpc:$IRIS_MPC_IMAGE_TAG"

- name: SMPC__HEARTBEAT_INITIAL_RETRIES
value: "1000"

initContainer:
enabled: true
image: "ghcr.io/worldcoin/iris-mpc:2694d8cbb37c278ed84951ef9aac3af47b21f146" # no-cuda image
image: "ghcr.io/worldcoin/iris-mpc:4913ef30024615c5dca0132a22c2971158e1cc0e" # no-cuda image
name: "iris-mpc-0-copy-cuda-libs"
env:
- name: AWS_REGION
Expand All @@ -218,4 +227,5 @@ iris-mpc-0:
aws s3 cp s3://wf-smpcv2-stage-libs/libcublas.so.12.2.5.6 .
aws s3 cp s3://wf-smpcv2-stage-libs/libcublasLt.so.12.2.5.6 .

key-manager --node-id 0 --env $ENV --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-stage-public-keys --region $AWS_REGION
key-manager --node-id 0 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
key-manager --node-id 0 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
16 changes: 13 additions & 3 deletions deploy/e2e/iris-mpc-1.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ iris-mpc-1:
- name: AWS_REGION
value: "$AWS_REGION"

- name: AWS_ACCESS_KEY_ID
value: "access_key"

- name: AWS_SECRET_ACCESS_KEY
value: "secret_key"

- name: AWS_ENDPOINT_URL
value: "http://localstack:4566"

Expand All @@ -103,7 +109,7 @@ iris-mpc-1:
value: "eth0"

- name: NCCL_COMM_ID
value: "iris-mpc-1.svc.cluster.local:4000"
value: "iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local:4000"

- name: SMPC__ENVIRONMENT
value: "$ENV"
Expand Down Expand Up @@ -189,14 +195,17 @@ iris-mpc-1:
value: "true"

- name: SMPC__NODE_HOSTNAMES
value: '["iris-mpc-0.svc.cluster.local","iris-mpc-1.svc.cluster.local","iris-mpc-2.svc.cluster.local"]'
value: '["iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local","iris-mpc-1.iris-mpc-1.$ENV.svc.cluster.local","iris-mpc-2.iris-mpc-2.$ENV.svc.cluster.local"]'

- name: SMPC__IMAGE_NAME
value: "ghcr.io/worldcoin/iris-mpc:$IRIS_MPC_IMAGE_TAG"

- name: SMPC__HEARTBEAT_INITIAL_RETRIES
value: "1000"

initContainer:
enabled: true
image: "ghcr.io/worldcoin/iris-mpc:2694d8cbb37c278ed84951ef9aac3af47b21f146" # no-cuda image
image: "ghcr.io/worldcoin/iris-mpc:4913ef30024615c5dca0132a22c2971158e1cc0e" # no-cuda image
name: "iris-mpc-1-copy-cuda-libs"
env:
- name: AWS_REGION
Expand All @@ -219,3 +228,4 @@ iris-mpc-1:
aws s3 cp s3://wf-smpcv2-stage-libs/libcublasLt.so.12.2.5.6 .

key-manager --node-id 1 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
key-manager --node-id 1 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
16 changes: 13 additions & 3 deletions deploy/e2e/iris-mpc-2.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ iris-mpc-2:
- name: AWS_REGION
value: "$AWS_REGION"

- name: AWS_ACCESS_KEY_ID
value: "access_key"

- name: AWS_SECRET_ACCESS_KEY
value: "secret_key"

- name: AWS_ENDPOINT_URL
value: "http://localstack:4566"

Expand All @@ -103,7 +109,7 @@ iris-mpc-2:
value: "eth0"

- name: NCCL_COMM_ID
value: "iris-mpc-2.svc.cluster.local:4000"
value: "iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local:4000"

- name: SMPC__ENVIRONMENT
value: "$ENV"
Expand Down Expand Up @@ -189,14 +195,17 @@ iris-mpc-2:
value: "true"

- name: SMPC__NODE_HOSTNAMES
value: '["iris-mpc-0.svc.cluster.local","iris-mpc-1.svc.cluster.local","iris-mpc-2.svc.cluster.local"]'
value: '["iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local","iris-mpc-1.iris-mpc-1.$ENV.svc.cluster.local","iris-mpc-2.iris-mpc-2.$ENV.svc.cluster.local"]'

- name: SMPC__IMAGE_NAME
value: "ghcr.io/worldcoin/iris-mpc:$IRIS_MPC_IMAGE_TAG"

- name: SMPC__HEARTBEAT_INITIAL_RETRIES
value: "1000"

initContainer:
enabled: true
image: "ghcr.io/worldcoin/iris-mpc:2694d8cbb37c278ed84951ef9aac3af47b21f146" # no-cuda image
image: "ghcr.io/worldcoin/iris-mpc:4913ef30024615c5dca0132a22c2971158e1cc0e" # no-cuda image
name: "iris-mpc-2-copy-cuda-libs"
env:
- name: AWS_REGION
Expand All @@ -219,3 +228,4 @@ iris-mpc-2:
aws s3 cp s3://wf-smpcv2-stage-libs/libcublasLt.so.12.2.5.6 .

key-manager --node-id 2 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
key-manager --node-id 2 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
2 changes: 1 addition & 1 deletion iris-mpc-common/src/bin/key_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct KeyManagerCli {
)]
node_id: String,

#[arg(short, long, env, default_value = "stage")]
#[arg(long, env, default_value = "stage")]
env: String,

#[arg(short, long, env, default_value = "eu-north-1")]
Expand Down
Loading