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

Pin the image versions #102

Merged
merged 3 commits into from
Mar 15, 2024
Merged

Pin the image versions #102

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
43d1a44
Pin the image versions
ImJeremyHe Mar 14, 2024
0ef733f
Fix the vid
ImJeremyHe Mar 15, 2024
f22c585
Fix the e2e test
ImJeremyHe Mar 15, 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 arbitrator/vid-helper/src/bytes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl<const N: usize> From<[u8; N]> for Bytes {

impl<const N: usize> From<&[u8; N]> for Bytes {
fn from(bytes: &[u8; N]) -> Self {
Self(bytes.into())
Self((*bytes).into())
}
}

Expand Down
4 changes: 2 additions & 2 deletions system_tests/espresso-e2e/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ ESPRESSO_COMMITMENT_TASK_PORT=60000
ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o
ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1=BLS_SIGNING_KEY~-DO72m_SFl6NQMYknm05FYpPEklkeqz-B3g2mFdbuS83

ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0=STATEKEY~YC2YwzvFypi98JLHHEydp6EGMkcSsEZBEnByNBnajgE-
ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1=STATEKEY~5JJJJ9OhX320me8TUKZ15iRTVHslYyULwlDm3FG5vAOk
ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0=SCHNORR_SIGNING_KEY~XxPSER8Vh3nFj_m7cUQ--96JfKrycrSKyRQximkQigCo
ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1=SCHNORR_SIGNING_KEY~2NpKtvY5F0u1LWgYws-JeX1vDdp5CfECuaMMYxyz4gDM

ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX=8
ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f
Expand Down
14 changes: 7 additions & 7 deletions system_tests/espresso-e2e/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.9'
services:
orchestrator:
image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:main
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wonder why we're using the arbmusl tag?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah so this is the musl image from the arb branch? Maybe call the branch arbitrum-integration to be a bit more descriptive?

Copy link
Member Author

@ImJeremyHe ImJeremyHe Mar 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. I checkouted a branch called arb in sequencer repo and run the static-build action manually. And it created this tag. I don't know if it is appropriate to do that. But I think it is convenient for us to track and update

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem. Let's update the branch name. Then the tag would be arbitrum-integrationmusl

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We usually use the non-static docker images (it shouldn't matter here though) but it's probably better to be consistent.

If you want the branch to have docker images published when new commits are pushed to it I think you need to add the branch to the github actions triggers. For example here: https://github.com/EspressoSystems/espresso-sequencer/blob/3f5beae8e9f121987ecdacebb87be7ca5c0ab99d/.github/workflows/build.yml#L7

Or you can call the branch release-... then it will match an existing branch trigger.

Copy link
Member Author

@ImJeremyHe ImJeremyHe Mar 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think a better way for the integration is to publish the images manually. That means the test won't be broken by any code update. And if some one is going to publish the new version with this tag, and he will be responsible for checking all the tests.

image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:arbitrum-integrationmusl
ports:
- "$ESPRESSO_ORCHESTRATOR_PORT:$ESPRESSO_ORCHESTRATOR_PORT"
environment:
Expand All @@ -16,7 +16,7 @@ services:
- RUST_LOG_FORMAT

da-server:
image: ghcr.io/espressosystems/espresso-sequencer/web-server:main
image: ghcr.io/espressosystems/espresso-sequencer/web-server:arbitrum-integrationmusl
ports:
- "$ESPRESSO_DA_SERVER_PORT:$ESPRESSO_WEB_SERVER_PORT"
environment:
Expand All @@ -28,7 +28,7 @@ services:
condition: service_healthy

consensus-server:
image: ghcr.io/espressosystems/espresso-sequencer/web-server:main
image: ghcr.io/espressosystems/espresso-sequencer/web-server:arbitrum-integrationmusl
ports:
- "$ESPRESSO_CONSENSUS_SERVER_PORT:$ESPRESSO_WEB_SERVER_PORT"
environment:
Expand All @@ -40,7 +40,7 @@ services:
condition: service_healthy

espresso-sequencer0:
image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main
image: ghcr.io/espressosystems/espresso-sequencer/sequencer:arbitrum-integrationmusl
ports:
- "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT"
# Run the API server (with options taken from the environment) and the optional submission API
Expand Down Expand Up @@ -75,7 +75,7 @@ services:
- "host.docker.internal:host-gateway"

espresso-sequencer1:
image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main
image: ghcr.io/espressosystems/espresso-sequencer/sequencer:arbitrum-integrationmusl
ports:
- "$ESPRESSO_SEQUENCER1_API_PORT:$ESPRESSO_SEQUENCER_API_PORT"
# Run the API server (with options taken from the environment)
Expand Down Expand Up @@ -110,7 +110,7 @@ services:
- "host.docker.internal:host-gateway"

commitment-task:
image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:main
image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:arbitrum-integrationmusl
ports:
- "$ESPRESSO_COMMITMENT_TASK_PORT:$ESPRESSO_COMMITMENT_TASK_PORT"
command: commitment-task --deploy
Expand All @@ -134,7 +134,7 @@ services:
- "host.docker.internal:host-gateway"

state-relay-server:
image: ghcr.io/espressosystems/espresso-sequencer/state-relay-server:main
image: ghcr.io/espressosystems/espresso-sequencer/state-relay-server:arbitrum-integrationmusl
ports:
- "$ESPRESSO_STATE_RELAY_SERVER_PORT:$ESPRESSO_STATE_RELAY_SERVER_PORT"
environment:
Expand Down
4 changes: 2 additions & 2 deletions system_tests/espresso_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ func createL2Node(ctx context.Context, t *testing.T, hotshot_url string, builder

nodeConfig.Feed.Output.Enable = true
nodeConfig.Feed.Output.Addr = "0.0.0.0"
builder.nodeConfig.Feed.Output.Enable = true
builder.nodeConfig.Feed.Output.Port = fmt.Sprintf("%d", broadcastPort)
nodeConfig.Feed.Output.Enable = true
nodeConfig.Feed.Output.Port = fmt.Sprintf("%d", broadcastPort)

client, cleanup := builder.Build2ndNode(t, &SecondNodeParams{nodeConfig: nodeConfig})
return client, builder.L2Info, cleanup
Expand Down
Loading