From 9f753c39e474d51841e4c65b96e8b91b1e4f9e2c Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Sat, 1 Jun 2024 20:38:47 -0400 Subject: [PATCH 1/2] Update e2e test to use CRDB v22.2.19 --- .github/workflows/build-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 9c92d3041e..4b6dfdbf05 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -139,12 +139,12 @@ jobs: e2e/newenemy/chaosd e2e/newenemy/watchmaker # this key will need to be bumped when dependencies are changed - key: "cockroach-v22.1.5-chaosd-v1.1.1" + key: "cockroach-v22.2.19-chaosd-v1.1.1" - name: "Install cockroachdb and chaosd" if: "steps.cache-binaries.outputs.cache-hit != 'true'" working-directory: "e2e/newenemy" run: | - curl https://binaries.cockroachdb.com/cockroach-v22.1.5.linux-amd64.tgz | tar -xz && mv cockroach-v22.1.5.linux-amd64/cockroach ./cockroach + curl https://binaries.cockroachdb.com/cockroach-v22.2.19.linux-amd64.tgz | tar -xz && mv cockroach-v22.2.19.linux-amd64/cockroach ./cockroach curl -fsSL https://mirrors.chaos-mesh.org/chaosd-v1.1.1-linux-amd64.tar.gz | tar -xz && mv chaosd-v1.1.1-linux-amd64/chaosd ./chaosd - uses: "buildjet/cache@v4" with: From 4a56a32d80059da01b2f1910bff58e65982a0ee9 Mon Sep 17 00:00:00 2001 From: Evan Cordell Date: Sun, 23 Jun 2024 12:23:41 -0400 Subject: [PATCH 2/2] e2e: use a smaller delay --- e2e/newenemy/newenemy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/newenemy/newenemy_test.go b/e2e/newenemy/newenemy_test.go index 7c37737442..9347000ad0 100644 --- a/e2e/newenemy/newenemy_test.go +++ b/e2e/newenemy/newenemy_test.go @@ -198,7 +198,7 @@ func TestNoNewEnemy(t *testing.T) { fill(ctx, t, vulnerableSpiceDB[0].Client().V1().Permissions(), prefix, generator.NewUniqueGenerator(objIDRegex), 500, 500) t.Log("modifying time") - require.NoError(t, crdb.TimeDelay(ctx, e2e.MustFile(ctx, t, "timeattack-1.log"), 1, -200*time.Millisecond)) + require.NoError(t, crdb.TimeDelay(ctx, e2e.MustFile(ctx, t, "timeattack-1.log"), 1, -40*time.Millisecond)) tests := []struct { name string