From cbc8324063f24075bc462e2bf4ab45062818ef0a Mon Sep 17 00:00:00 2001 From: cskh Date: Wed, 10 May 2023 22:22:16 -0400 Subject: [PATCH] increase the timeout for dockerfile --- .github/workflows/test-integrations.yml | 12 ++++++++++++ .../integration/consul-container/libs/cluster/app.go | 1 + .../consul-container/libs/service/connect.go | 2 +- .../consul-container/libs/service/examples.go | 2 +- .../consul-container/libs/service/gateway.go | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index ffdb40962d..6f723658ed 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -611,6 +611,10 @@ jobs: path: . - name: restore mode+x run: chmod +x consul + - name: docker verson and info + run: | + docker version + docker info - name: Build consul:local image run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile . - name: Configure GH workaround for ipv6 loopback @@ -684,6 +688,10 @@ jobs: path: . - name: restore mode+x run: chmod +x consul + - name: docker verson and info + run: | + docker version + docker info - name: Build consul:local image run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile . - name: Configure GH workaround for ipv6 loopback @@ -757,6 +765,10 @@ jobs: path: . - name: restore mode+x run: chmod +x consul + - name: docker verson and info + run: | + docker version + docker info - name: Build consul:local image run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile . - name: Configure GH workaround for ipv6 loopback diff --git a/test/integration/consul-container/libs/cluster/app.go b/test/integration/consul-container/libs/cluster/app.go index f434fcff13..2e54cc7ee3 100644 --- a/test/integration/consul-container/libs/cluster/app.go +++ b/test/integration/consul-container/libs/cluster/app.go @@ -39,6 +39,7 @@ func LaunchContainerOnNode( if req.Name == "" { return nil, fmt.Errorf("ContainerRequest requires the Name field") } + if req.NetworkMode != "" { return nil, fmt.Errorf("caller should not configure ContainerRequest.NetworkMode") } diff --git a/test/integration/consul-container/libs/service/connect.go b/test/integration/consul-container/libs/service/connect.go index d172204b5d..c36c731476 100644 --- a/test/integration/consul-container/libs/service/connect.go +++ b/test/integration/consul-container/libs/service/connect.go @@ -187,7 +187,7 @@ func NewConnectService(ctx context.Context, sidecarCfg SidecarConfig, serviceBin req := testcontainers.ContainerRequest{ FromDockerfile: dockerfileCtx, - WaitingFor: wait.ForLog("").WithStartupTimeout(10 * time.Second), + WaitingFor: wait.ForLog("").WithStartupTimeout(60 * time.Second), AutoRemove: false, Name: containerName, Cmd: []string{ diff --git a/test/integration/consul-container/libs/service/examples.go b/test/integration/consul-container/libs/service/examples.go index 186a2dc9db..61503ee947 100644 --- a/test/integration/consul-container/libs/service/examples.go +++ b/test/integration/consul-container/libs/service/examples.go @@ -153,7 +153,7 @@ func NewExampleService(ctx context.Context, name string, httpPort int, grpcPort req := testcontainers.ContainerRequest{ Image: hashicorpDockerProxy + "/fortio/fortio", - WaitingFor: wait.ForLog("").WithStartupTimeout(10 * time.Second), + WaitingFor: wait.ForLog("").WithStartupTimeout(30 * time.Second), AutoRemove: false, Name: containerName, Cmd: command, diff --git a/test/integration/consul-container/libs/service/gateway.go b/test/integration/consul-container/libs/service/gateway.go index 09b74be243..e8a9e07703 100644 --- a/test/integration/consul-container/libs/service/gateway.go +++ b/test/integration/consul-container/libs/service/gateway.go @@ -196,7 +196,7 @@ func NewGatewayServiceReg(ctx context.Context, gwCfg GatewayConfig, node libclus req := testcontainers.ContainerRequest{ FromDockerfile: dockerfileCtx, - WaitingFor: wait.ForLog("").WithStartupTimeout(10 * time.Second), + WaitingFor: wait.ForLog("").WithStartupTimeout(60 * time.Second), AutoRemove: false, Name: containerName, Env: make(map[string]string),