From c505a1425a4913e857bf3ef03250d33dd2790b60 Mon Sep 17 00:00:00 2001 From: UMEZAWA Takeshi Date: Wed, 9 Aug 2023 11:01:22 +0900 Subject: [PATCH 1/2] incorporate moco-agent v0.10.0 Signed-off-by: UMEZAWA Takeshi --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0d83a0295..28be28619 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.13.24 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.67 github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1 - github.com/cybozu-go/moco-agent v0.9.0 + github.com/cybozu-go/moco-agent v0.10.0 github.com/go-logr/logr v1.2.4 github.com/go-logr/stdr v1.2.2 github.com/go-sql-driver/mysql v1.7.1 diff --git a/go.sum b/go.sum index b798074ed..9b716e9ec 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,8 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= -github.com/cybozu-go/moco-agent v0.9.0 h1:77WKgWYydknWVC3XPUE3YhNokutKmc7NHCy0bIqUV0o= -github.com/cybozu-go/moco-agent v0.9.0/go.mod h1:psUngzNi7oucca9XkyBV8d4SIkzOh6Sjwd2m4aqyWNE= +github.com/cybozu-go/moco-agent v0.10.0 h1:Mpy/LFzJ/eKbMbgEn4xecYgwrmrtjSGe9d26mDa7ciQ= +github.com/cybozu-go/moco-agent v0.10.0/go.mod h1:psUngzNi7oucca9XkyBV8d4SIkzOh6Sjwd2m4aqyWNE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From 3d8134a780ccd7cf84c4a321efabd35aed174c9b Mon Sep 17 00:00:00 2001 From: UMEZAWA Takeshi Date: Mon, 14 Aug 2023 14:51:20 +0900 Subject: [PATCH 2/2] extend test timeout because it takes more for Pods to become ready due to moco-agent v0.10.0. Signed-off-by: UMEZAWA Takeshi --- e2e/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/Makefile b/e2e/Makefile index 41fbb9426..59d75cf1a 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -54,12 +54,12 @@ endif .PHONY: test test: env PATH="$$(pwd)/../bin:$$PATH" RUN_E2E=1 \ - go test -v -race -timeout 30m . -ginkgo.progress -ginkgo.v -ginkgo.failFast + go test -v -race -timeout 40m . -ginkgo.progress -ginkgo.v -ginkgo.failFast .PHONY: test-upgrade test-upgrade: env PATH=$$(pwd)/../bin:$$PATH RUN_E2E=1 UPGRADE=1 \ - go test -v -race . -ginkgo.progress -ginkgo.v -ginkgo.failFast + go test -v -race -timeout 15m . -ginkgo.progress -ginkgo.v -ginkgo.failFast .PHONY: logs logs: