From c9a53111a60e38f8e127b4da01256c381ea6f218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Fri, 13 Oct 2023 15:51:28 +0200 Subject: [PATCH 1/2] Bump github.com/stretchr/testify to fix assert.EventuallyWithT --- test/new-e2e/go.mod | 2 +- test/new-e2e/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 752e9d9ef254..8181bdf40e47 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -25,7 +25,7 @@ require ( github.com/pulumi/pulumi/sdk/v3 v3.83.0 github.com/samber/lo v1.38.1 github.com/sethvargo/go-retry v0.2.4 - github.com/stretchr/testify v1.8.4 + github.com/stretchr/testify v1.8.5-0.20231013065317-89920137cdfa golang.org/x/crypto v0.11.0 golang.org/x/sys v0.10.0 golang.org/x/term v0.10.0 diff --git a/test/new-e2e/go.sum b/test/new-e2e/go.sum index 1252d7b75782..0a525ad95fd2 100644 --- a/test/new-e2e/go.sum +++ b/test/new-e2e/go.sum @@ -480,8 +480,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.5-0.20231013065317-89920137cdfa h1:I9YHewamqSIcEG6rpRhgF9p79H0cOojefpiOH0pe0VY= +github.com/stretchr/testify v1.8.5-0.20231013065317-89920137cdfa/go.mod h1:LZ02lxBfF+JCTGmBu/SyjoaIlOF6u2nxMP788uhnZlI= github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g= github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U= github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8= From 315aa6bee097ac1389fc67d6bc5fed82c63284fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Mon, 16 Oct 2023 10:25:46 +0200 Subject: [PATCH 2/2] Bump test-infra-definitions --- .gitlab-ci.yml | 2 +- test/new-e2e/go.mod | 2 +- test/new-e2e/go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29ec42868bdc..486021731d36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -166,7 +166,7 @@ variables: DATADOG_AGENT_NIKOS_BUILDIMAGES: v20878799-a2f77ae DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v20878799-a2f77ae - TEST_INFRA_DEFINITIONS_BUILDIMAGES: 40c538510ddf + TEST_INFRA_DEFINITIONS_BUILDIMAGES: 8db325351048 DATADOG_AGENT_BUILDERS: v19474930-fe4bcd9 DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 8181bdf40e47..7b46ec82c3fb 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -15,7 +15,7 @@ require ( // `TEST_INFRA_DEFINITIONS_BUILDIMAGES` matches the commit sha in the module version // Example: github.com/DataDog/test-infra-definitions v0.0.0-YYYYMMDDHHmmSS-0123456789AB // => TEST_INFRA_DEFINITIONS_BUILDIMAGES: 0123456789AB - github.com/DataDog/test-infra-definitions v0.0.0-20231010181312-40c538510ddf + github.com/DataDog/test-infra-definitions v0.0.0-20231016080402-8db325351048 github.com/aws/aws-sdk-go-v2 v1.21.0 github.com/aws/aws-sdk-go-v2/config v1.18.40 github.com/aws/aws-sdk-go-v2/service/ssm v1.36.4 diff --git a/test/new-e2e/go.sum b/test/new-e2e/go.sum index 0a525ad95fd2..f287d44ebb76 100644 --- a/test/new-e2e/go.sum +++ b/test/new-e2e/go.sum @@ -9,8 +9,8 @@ github.com/DataDog/datadog-api-client-go v1.16.0 h1:5jOZv1m98criCvYTa3qpW8Hzv301 github.com/DataDog/datadog-api-client-go v1.16.0/go.mod h1:PgrP2ABuJWL3Auw2iEkemAJ/r72ghG4DQQmb5sgnKW4= github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a h1:m9REhmyaWD5YJ0P53ygRHxKKo+KM+nw+zz0hEdKztMo= github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= -github.com/DataDog/test-infra-definitions v0.0.0-20231010181312-40c538510ddf h1:MnpFtU1NBqYw+jhrta1pInTAwq7dJ7Y2NOTI4WJW2hM= -github.com/DataDog/test-infra-definitions v0.0.0-20231010181312-40c538510ddf/go.mod h1:PqwpYO1dh26TxKAY1TiiMLmmSxzytx3OrXtYl086m2c= +github.com/DataDog/test-infra-definitions v0.0.0-20231016080402-8db325351048 h1:9hlp9LmyZwFvuWdtHB1VN5jaUoEKFiYn2HcWUReiWqk= +github.com/DataDog/test-infra-definitions v0.0.0-20231016080402-8db325351048/go.mod h1:PqwpYO1dh26TxKAY1TiiMLmmSxzytx3OrXtYl086m2c= github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f h1:5Vuo4niPKFkfwW55jV4vY0ih3VQ9RaQqeqY67fvRn8A=