Skip to content

Commit

Permalink
cleaning up in orchestratort
Browse files Browse the repository at this point in the history
  • Loading branch information
lumtis committed Feb 16, 2024
1 parent a0865b0 commit 378d8b7
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 35 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ stop-stress-test:
start-upgrade-test:
@echo "--> Starting upgrade test"
$(DOCKER) build --build-arg old_version=v12.2.1 -t zetanode -f ./Dockerfile-upgrade .
$(DOCKER) build -t orchestrator -f contrib/localnet/orchestrator/Dockerfile-upgrade.fastbuild .
$(DOCKER) build -t orchestrator -f contrib/localnet/orchestrator/Dockerfile.fastbuild .
cd contrib/localnet/ && $(DOCKER) compose -f docker-compose-upgrade.yml up -d

stop-upgrade-test:
Expand Down
2 changes: 0 additions & 2 deletions contrib/localnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ $ docker compose -f docker-compose-monitoring.yml down --remove-orphans

- TSS Address (on ETH): 0xF421292cb0d3c97b90EEEADfcD660B893592c6A2



## Add more e2e tests
The e2e test (integration tests) are located in the
orchestrator/smoketest directory. The orchestrator is a Go program.
Expand Down
6 changes: 0 additions & 6 deletions contrib/localnet/node.sh

This file was deleted.

22 changes: 0 additions & 22 deletions contrib/localnet/orchestrator/Dockerfile-upgrade.fastbuild

This file was deleted.

9 changes: 5 additions & 4 deletions contrib/localnet/orchestrator/Dockerfile.fastbuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM zetanode:latest as zeta
FROM ethereum/client-go:v1.10.26 as geth
FROM golang:1.20-alpine as orchestrator

RUN apk --no-cache add jq curl bash make git build-base
RUN apk --no-cache add jq curl bash make git build-base openssh

COPY --from=zeta /usr/local/bin/zetacored /usr/local/bin/
COPY --from=zeta /usr/local/bin/zetaclientd /usr/local/bin/
Expand All @@ -12,10 +12,11 @@ COPY --from=zeta /root/.ssh/localtest.pem.pub /root/.ssh/authorized_keys
COPY --from=zeta /root/.ssh/localtest.pem /root/.ssh/localtest.pem

COPY contrib/localnet/orchestrator/start.sh /work/
RUN chmod +x /work/start.sh

COPY contrib/localnet/orchestrator/start-upgrade.sh /work/
COPY contrib/localnet/orchestrator/restart-zetaclientd.sh /work/
RUN chmod +x /work/*.sh

COPY --from=zeta /usr/local/bin/zetae2e /usr/local/bin/
RUN chmod +x /usr/local/bin/zetae2e

WORKDIR /work
WORKDIR /work
4 changes: 4 additions & 0 deletions contrib/localnet/orchestrator/restart-zetaclientd.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

# This script is used to restart zetaclientd after an upgrade
# It waits for the upgrade height to be reached and then restarts the zetaclientd on all nodes in the network
# It interacts with the network using the zetaclientd binary

clibuilder()
{
echo ""
Expand Down

0 comments on commit 378d8b7

Please sign in to comment.