From 2987d8b8aa14f79f31876e140b14a1a530613ac5 Mon Sep 17 00:00:00 2001 From: Matthew McNeely Date: Fri, 21 Nov 2025 13:18:38 -0500 Subject: [PATCH 1/4] chore: correct the renovate path --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 34e888f6fd6..fbfaf6fb038 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["github>hypermodeinc/renovate-config"], + "extends": ["github>dgraph-io/renovate-config"], "rangeStrategy": "widen", "ignorePaths": ["contrib/**"], "baseBranches": ["main", "release/v24.1"], From 7ef170a278ea87b4b892f4985577a9e744e3e254 Mon Sep 17 00:00:00 2001 From: mattthew Date: Fri, 21 Nov 2025 13:56:12 -0500 Subject: [PATCH 2/4] Include JSON files in required actions running --- .github/workflows/ci-dgraph-core-tests.yml | 1 + .github/workflows/ci-dgraph-core-upgrade-tests.yml | 1 + .github/workflows/ci-dgraph-fuzz.yml | 1 + .github/workflows/ci-dgraph-integration2-tests.yml | 1 + .github/workflows/ci-dgraph-ldbc-tests.yml | 1 + .github/workflows/ci-dgraph-load-tests.yml | 1 + .github/workflows/ci-dgraph-system-upgrade-tests-mt.yml | 1 + .../ci-dgraph-system-upgrade-tests-mutations-and-queries.yml | 1 + .github/workflows/ci-dgraph-system-upgrade-tests-plugin.yml | 1 + .github/workflows/ci-dgraph-systest-tests.yml | 1 + .github/workflows/ci-dgraph-tests-arm64.yml | 1 + .github/workflows/ci-dgraph-vector-tests.yml | 1 + 12 files changed, 12 insertions(+) diff --git a/.github/workflows/ci-dgraph-core-tests.yml b/.github/workflows/ci-dgraph-core-tests.yml index c9c0225b868..44febfb4010 100644 --- a/.github/workflows/ci-dgraph-core-tests.yml +++ b/.github/workflows/ci-dgraph-core-tests.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-core-upgrade-tests.yml b/.github/workflows/ci-dgraph-core-upgrade-tests.yml index f88eb9b8845..6cffaa9382f 100644 --- a/.github/workflows/ci-dgraph-core-upgrade-tests.yml +++ b/.github/workflows/ci-dgraph-core-upgrade-tests.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-fuzz.yml b/.github/workflows/ci-dgraph-fuzz.yml index 4e0f9015743..6082fb9ab7b 100644 --- a/.github/workflows/ci-dgraph-fuzz.yml +++ b/.github/workflows/ci-dgraph-fuzz.yml @@ -6,6 +6,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-integration2-tests.yml b/.github/workflows/ci-dgraph-integration2-tests.yml index 40c3ef28c9d..5c2661dfa21 100644 --- a/.github/workflows/ci-dgraph-integration2-tests.yml +++ b/.github/workflows/ci-dgraph-integration2-tests.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-ldbc-tests.yml b/.github/workflows/ci-dgraph-ldbc-tests.yml index 6b56855ea79..d62c821176a 100644 --- a/.github/workflows/ci-dgraph-ldbc-tests.yml +++ b/.github/workflows/ci-dgraph-ldbc-tests.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-load-tests.yml b/.github/workflows/ci-dgraph-load-tests.yml index 0aee7076e43..617ceabdb38 100644 --- a/.github/workflows/ci-dgraph-load-tests.yml +++ b/.github/workflows/ci-dgraph-load-tests.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-system-upgrade-tests-mt.yml b/.github/workflows/ci-dgraph-system-upgrade-tests-mt.yml index f30f6cba304..f9c143cbe6f 100644 --- a/.github/workflows/ci-dgraph-system-upgrade-tests-mt.yml +++ b/.github/workflows/ci-dgraph-system-upgrade-tests-mt.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-system-upgrade-tests-mutations-and-queries.yml b/.github/workflows/ci-dgraph-system-upgrade-tests-mutations-and-queries.yml index 6e8a043842b..7794a72766b 100644 --- a/.github/workflows/ci-dgraph-system-upgrade-tests-mutations-and-queries.yml +++ b/.github/workflows/ci-dgraph-system-upgrade-tests-mutations-and-queries.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-system-upgrade-tests-plugin.yml b/.github/workflows/ci-dgraph-system-upgrade-tests-plugin.yml index 10dfe7767a3..9b2ffd0d55d 100644 --- a/.github/workflows/ci-dgraph-system-upgrade-tests-plugin.yml +++ b/.github/workflows/ci-dgraph-system-upgrade-tests-plugin.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-systest-tests.yml b/.github/workflows/ci-dgraph-systest-tests.yml index 90b2b0bf3dc..8bf85e6e376 100644 --- a/.github/workflows/ci-dgraph-systest-tests.yml +++ b/.github/workflows/ci-dgraph-systest-tests.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-tests-arm64.yml b/.github/workflows/ci-dgraph-tests-arm64.yml index 910e66bd9f0..a548af3d244 100644 --- a/.github/workflows/ci-dgraph-tests-arm64.yml +++ b/.github/workflows/ci-dgraph-tests-arm64.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: diff --git a/.github/workflows/ci-dgraph-vector-tests.yml b/.github/workflows/ci-dgraph-vector-tests.yml index d0b6ca88201..74d07b7a080 100644 --- a/.github/workflows/ci-dgraph-vector-tests.yml +++ b/.github/workflows/ci-dgraph-vector-tests.yml @@ -7,6 +7,7 @@ on: - "**/*.go" - "**/go.mod" - "**/*.yml" + - "**/*.json" - "**/Dockerfile" - "**/Makefile" types: From d5b43072f07f0e414dc3f9419ca39d7e040bae38 Mon Sep 17 00:00:00 2001 From: mattthew Date: Fri, 21 Nov 2025 14:35:03 -0500 Subject: [PATCH 3/4] Add a rety to namespace login test func --- dgraphtest/local_cluster.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dgraphtest/local_cluster.go b/dgraphtest/local_cluster.go index 0d1fa97436b..6feb1d67f01 100644 --- a/dgraphtest/local_cluster.go +++ b/dgraphtest/local_cluster.go @@ -777,7 +777,13 @@ func (c *LocalCluster) waitUntilGraphqlHealthCheck() error { return errors.Wrap(err, "error creating http client while graphql health check") } if c.conf.acl { - if err := hc.LoginIntoNamespace(dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.RootNamespace); err != nil { + for range 5 { + if err = hc.LoginIntoNamespace(dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.RootNamespace); err == nil { + break + } + time.Sleep(1 * time.Second) + } + if err != nil { return errors.Wrap(err, "error during login while graphql health check") } } From 0dde9029d4d3b92f88cd3f89bf086fb680869985 Mon Sep 17 00:00:00 2001 From: mattthew Date: Fri, 21 Nov 2025 17:20:18 -0500 Subject: [PATCH 4/4] Bump runner spec for compute and memory intensive tests --- .github/workflows/ci-dgraph-integration2-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-dgraph-integration2-tests.yml b/.github/workflows/ci-dgraph-integration2-tests.yml index 5c2661dfa21..6953350f127 100644 --- a/.github/workflows/ci-dgraph-integration2-tests.yml +++ b/.github/workflows/ci-dgraph-integration2-tests.yml @@ -25,7 +25,7 @@ permissions: jobs: dgraph-integration2-tests: if: github.event.pull_request.draft == false - runs-on: blacksmith-8vcpu-ubuntu-2404 + runs-on: blacksmith-16vcpu-ubuntu-2404 timeout-minutes: 90 steps: - uses: actions/checkout@v5