From b3f985092d6157df587a2ef923a3955de2ab775f Mon Sep 17 00:00:00 2001 From: lumtis Date: Thu, 28 Dec 2023 17:17:44 +0100 Subject: [PATCH] test removing mount in dockerfile --- Dockerfile | 15 +++++++++------ Makefile | 4 ++-- cmd/zetae2e/local/local.go | 2 +- cmd/zetae2e/local/utils.go | 6 +++--- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4f8274b8e..d2fe91c032 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,14 +10,17 @@ RUN ssh-keygen -b 2048 -t rsa -f /root/.ssh/localtest.pem -q -N "" WORKDIR /go/delivery/zeta-node COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target=/root/.cache/go-build \ - go mod download +#RUN --mount=type=cache,target=/root/.cache/go-build \ +# go mod download +RUN go mod download COPY . . -RUN --mount=type=cache,target=/root/.cache/go-build \ - make install -RUN --mount=type=cache,target=/root/.cache/go-build \ - make install-zetae2e +#RUN --mount=type=cache,target=/root/.cache/go-build \ +# make install +#RUN --mount=type=cache,target=/root/.cache/go-build \ +# make install-zetae2e +RUN make install +RUN make install-zetae2e # #FROM golang:1.20-alpine diff --git a/Makefile b/Makefile index 3dafe6cd4c..dd47b6a541 100644 --- a/Makefile +++ b/Makefile @@ -83,8 +83,8 @@ build-testnet-ubuntu: go.sum install: go.sum @echo "--> Installing zetacored & zetaclientd" - @go install -race -mod=readonly $(BUILD_FLAGS) ./cmd/zetacored - @go install -race -mod=readonly $(BUILD_FLAGS) ./cmd/zetaclientd + @go install -mod=readonly $(BUILD_FLAGS) ./cmd/zetacored + @go install -mod=readonly $(BUILD_FLAGS) ./cmd/zetaclientd install-zetaclient: go.sum @echo "--> Installing zetaclientd" diff --git a/cmd/zetae2e/local/local.go b/cmd/zetae2e/local/local.go index 69ab90c740..a53d450755 100644 --- a/cmd/zetae2e/local/local.go +++ b/cmd/zetae2e/local/local.go @@ -133,7 +133,7 @@ func localE2ETest(cmd *cobra.Command, _ []string) { time.Sleep(70 * time.Second) // initialize deployer runner with config - deployerRunner, err := runnerFromConfig( + deployerRunner, err := localRunnerFromConfig( ctx, "deployer", cancel, diff --git a/cmd/zetae2e/local/utils.go b/cmd/zetae2e/local/utils.go index 6e9fdc1253..e6c0176fe8 100644 --- a/cmd/zetae2e/local/utils.go +++ b/cmd/zetae2e/local/utils.go @@ -57,7 +57,7 @@ func initTestRunner( logger *runner.Logger, ) (*runner.SmokeTestRunner, error) { // initialize runner for test - testRunner, err := runnerFromConfig( + testRunner, err := localRunnerFromConfig( deployerRunner.Ctx, name, deployerRunner.CtxCancel, @@ -78,8 +78,8 @@ func initTestRunner( return testRunner, nil } -// runnerFromConfig create test runner from config -func runnerFromConfig( +// localRunnerFromConfig create test runner from config for local test +func localRunnerFromConfig( ctx context.Context, name string, ctxCancel context.CancelFunc,