From e211295ac286333368f7bc35c4528a997f856c2b Mon Sep 17 00:00:00 2001 From: mattthew Date: Mon, 24 Nov 2025 13:16:18 -0500 Subject: [PATCH 1/3] Combine all jobs into one workflow; change schedule to weekly --- .../ci-dgraph-system-upgrade-tests-mt.yml | 58 ---------- ...em-upgrade-tests-mutations-and-queries.yml | 58 ---------- .../ci-dgraph-system-upgrade-tests-plugin.yml | 58 ---------- .../ci-dgraph-weekly-upgrade-tests.yml | 109 ++++++++++++++++++ 4 files changed, 109 insertions(+), 174 deletions(-) delete mode 100644 .github/workflows/ci-dgraph-system-upgrade-tests-mt.yml delete mode 100644 .github/workflows/ci-dgraph-system-upgrade-tests-mutations-and-queries.yml delete mode 100644 .github/workflows/ci-dgraph-system-upgrade-tests-plugin.yml create mode 100644 .github/workflows/ci-dgraph-weekly-upgrade-tests.yml diff --git a/.github/workflows/ci-dgraph-system-upgrade-tests-mt.yml b/.github/workflows/ci-dgraph-system-upgrade-tests-mt.yml deleted file mode 100644 index f9c143cbe6f..00000000000 --- a/.github/workflows/ci-dgraph-system-upgrade-tests-mt.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: ci-dgraph-system-upgrade-tests-multi-tenancy - -on: - pull_request: - paths: - - "!**/*.md" - - "**/*.go" - - "**/go.mod" - - "**/*.yml" - - "**/*.json" - - "**/Dockerfile" - - "**/Makefile" - types: - - opened - - reopened - - synchronize - - ready_for_review - branches: - - main - - release/** - -permissions: - contents: read - -jobs: - dgraph-upgrade-tests: - if: github.event.pull_request.draft == false - runs-on: blacksmith-8vcpu-ubuntu-2404 - timeout-minutes: 90 - steps: - - uses: actions/checkout@v5 - with: - fetch-depth: 0 - - name: Set up Go - uses: actions/setup-go@v6 - with: - go-version-file: go.mod - - name: Make Linux Build and Docker Image - run: make docker-image - - name: Clean Up Environment - run: | - #!/bin/bash - # clean cache - go clean -testcache - - name: Run System Upgrade Tests - run: | - #!/bin/bash - # go env settings - export GOPATH=~/go - # move the binary - cp dgraph/dgraph ~/go/bin/dgraph - # run the sytem upgrade tests - go test -v -timeout=120m -failfast -tags=upgrade \ - github.com/hypermodeinc/dgraph/v25/systest/multi-tenancy - # clean up docker containers after test execution - go clean -testcache - # sleep - sleep 5 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 deleted file mode 100644 index 7794a72766b..00000000000 --- a/.github/workflows/ci-dgraph-system-upgrade-tests-mutations-and-queries.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: ci-dgraph-system-upgrade-tests-mutations-and-queries - -on: - pull_request: - paths: - - "!**/*.md" - - "**/*.go" - - "**/go.mod" - - "**/*.yml" - - "**/*.json" - - "**/Dockerfile" - - "**/Makefile" - types: - - opened - - reopened - - synchronize - - ready_for_review - branches: - - main - - release/** - -permissions: - contents: read - -jobs: - dgraph-upgrade-tests: - if: github.event.pull_request.draft == false - runs-on: blacksmith-8vcpu-ubuntu-2404 - timeout-minutes: 90 - steps: - - uses: actions/checkout@v5 - with: - fetch-depth: 0 - - name: Set up Go - uses: actions/setup-go@v6 - with: - go-version-file: go.mod - - name: Make Linux Build and Docker Image - run: make docker-image - - name: Clean Up Environment - run: | - #!/bin/bash - # clean cache - go clean -testcache - - name: Run System Upgrade Tests - run: | - #!/bin/bash - # go env settings - export GOPATH=~/go - # move the binary - cp dgraph/dgraph ~/go/bin/dgraph - # run the sytem upgrade tests - go test -v -timeout=120m -failfast -tags=upgrade \ - github.com/hypermodeinc/dgraph/v25/systest/mutations-and-queries - # clean up docker containers after test execution - go clean -testcache - # sleep - sleep 5 diff --git a/.github/workflows/ci-dgraph-system-upgrade-tests-plugin.yml b/.github/workflows/ci-dgraph-system-upgrade-tests-plugin.yml deleted file mode 100644 index 9b2ffd0d55d..00000000000 --- a/.github/workflows/ci-dgraph-system-upgrade-tests-plugin.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: ci-dgraph-system-upgrade-tests-plugin - -on: - pull_request: - paths: - - "!**/*.md" - - "**/*.go" - - "**/go.mod" - - "**/*.yml" - - "**/*.json" - - "**/Dockerfile" - - "**/Makefile" - types: - - opened - - reopened - - synchronize - - ready_for_review - branches: - - main - - release/** - -permissions: - contents: read - -jobs: - dgraph-upgrade-tests: - if: github.event.pull_request.draft == false - runs-on: blacksmith-4vcpu-ubuntu-2404 - timeout-minutes: 90 - steps: - - uses: actions/checkout@v5 - with: - fetch-depth: 0 - - name: Set up Go - uses: actions/setup-go@v6 - with: - go-version-file: go.mod - - name: Make Linux Build and Docker Image - run: make docker-image - - name: Clean Up Environment - run: | - #!/bin/bash - # clean cache - go clean -testcache - - name: Run System Upgrade Tests - run: | - #!/bin/bash - # go env settings - export GOPATH=~/go - # move the binary - cp dgraph/dgraph ~/go/bin/dgraph - # run the sytem upgrade tests - go test -v -timeout=120m -failfast -tags=upgrade \ - github.com/hypermodeinc/dgraph/v25/systest/plugin - # clean up docker containers after test execution - go clean -testcache - # sleep - sleep 5 diff --git a/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml b/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml new file mode 100644 index 00000000000..7d4e7dfe459 --- /dev/null +++ b/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml @@ -0,0 +1,109 @@ +name: ci-dgraph-weekly-upgrade-tests + +on: + schedule: + - cron: "0 0 * * 0" + workflow_dispatch: + +permissions: + contents: read + +jobs: + dgraph-upgrade-tests-mutations-and-queries: + runs-on: blacksmith-16vcpu-ubuntu-2404 + timeout-minutes: 90 + steps: + - uses: actions/checkout@v5 + with: + fetch-depth: 0 + - name: Set up Go + uses: actions/setup-go@v6 + with: + go-version-file: go.mod + - name: Make Linux Build and Docker Image + run: make docker-image + - name: Clean Up Environment + run: | + #!/bin/bash + # clean cache + go clean -testcache + - name: Run System Upgrade Tests + run: | + #!/bin/bash + # go env settings + export GOPATH=~/go + # move the binary + cp dgraph/dgraph ~/go/bin/dgraph + # run the sytem upgrade tests + go test -v -timeout=120m -failfast -tags=upgrade \ + github.com/hypermodeinc/dgraph/v25/systest/mutations-and-queries + # clean up docker containers after test execution + go clean -testcache + # sleep + sleep 5 + + dgraph-upgrade-tests-multi-tenancy: + runs-on: blacksmith-8vcpu-ubuntu-2404 + timeout-minutes: 90 + steps: + - uses: actions/checkout@v5 + with: + fetch-depth: 0 + - name: Set up Go + uses: actions/setup-go@v6 + with: + go-version-file: go.mod + - name: Make Linux Build and Docker Image + run: make docker-image + - name: Clean Up Environment + run: | + #!/bin/bash + # clean cache + go clean -testcache + - name: Run System Upgrade Tests + run: | + #!/bin/bash + # go env settings + export GOPATH=~/go + # move the binary + cp dgraph/dgraph ~/go/bin/dgraph + # run the sytem upgrade tests + go test -v -timeout=120m -failfast -tags=upgrade \ + github.com/hypermodeinc/dgraph/v25/systest/multi-tenancy + # clean up docker containers after test execution + go clean -testcache + # sleep + sleep 5 + + dgraph-upgrade-tests-plugin: + runs-on: blacksmith-4vcpu-ubuntu-2404 + timeout-minutes: 90 + steps: + - uses: actions/checkout@v5 + with: + fetch-depth: 0 + - name: Set up Go + uses: actions/setup-go@v6 + with: + go-version-file: go.mod + - name: Make Linux Build and Docker Image + run: make docker-image + - name: Clean Up Environment + run: | + #!/bin/bash + # clean cache + go clean -testcache + - name: Run System Upgrade Tests + run: | + #!/bin/bash + # go env settings + export GOPATH=~/go + # move the binary + cp dgraph/dgraph ~/go/bin/dgraph + # run the sytem upgrade tests + go test -v -timeout=120m -failfast -tags=upgrade \ + github.com/hypermodeinc/dgraph/v25/systest/plugin + # clean up docker containers after test execution + go clean -testcache + # sleep + sleep 5 From d2c148bb6eaea93196dfa0b76cbf6aac07f34d56 Mon Sep 17 00:00:00 2001 From: mattthew Date: Mon, 24 Nov 2025 13:18:55 -0500 Subject: [PATCH 2/3] Satisfy the linter --- .github/workflows/ci-dgraph-weekly-upgrade-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml b/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml index 7d4e7dfe459..2af9178bc9b 100644 --- a/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml +++ b/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml @@ -2,7 +2,7 @@ name: ci-dgraph-weekly-upgrade-tests on: schedule: - - cron: "0 0 * * 0" + - cron: 0 0 * * 0 workflow_dispatch: permissions: From 96c1a0afb660baf11964c196ff7182e3ef79eb60 Mon Sep 17 00:00:00 2001 From: mattthew Date: Mon, 24 Nov 2025 14:02:41 -0500 Subject: [PATCH 3/3] Include the core upgrade tests --- .../ci-dgraph-core-upgrade-tests.yml | 60 ------------------- .../ci-dgraph-weekly-upgrade-tests.yml | 35 +++++++++++ 2 files changed, 35 insertions(+), 60 deletions(-) delete mode 100644 .github/workflows/ci-dgraph-core-upgrade-tests.yml diff --git a/.github/workflows/ci-dgraph-core-upgrade-tests.yml b/.github/workflows/ci-dgraph-core-upgrade-tests.yml deleted file mode 100644 index 6cffaa9382f..00000000000 --- a/.github/workflows/ci-dgraph-core-upgrade-tests.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: ci-dgraph-core-upgrade-tests - -on: - pull_request: - paths: - - "!**/*.md" - - "**/*.go" - - "**/go.mod" - - "**/*.yml" - - "**/*.json" - - "**/Dockerfile" - - "**/Makefile" - types: - - opened - - reopened - - synchronize - - ready_for_review - branches: - - main - - release/** - -permissions: - contents: read - -jobs: - dgraph-upgrade-tests: - if: github.event.pull_request.draft == false - runs-on: blacksmith-8vcpu-ubuntu-2404 - timeout-minutes: 60 - steps: - - uses: actions/checkout@v5 - with: - fetch-depth: 0 - - name: Set up Go - uses: actions/setup-go@v6 - with: - go-version-file: go.mod - - name: Make Linux Build and Docker Image - run: make docker-image - - name: Clean Up Environment - run: | - #!/bin/bash - # clean cache - go clean -testcache - - name: Run Core Upgrade Tests - run: | - #!/bin/bash - # go env settings - export GOPATH=~/go - # move the binary - cp dgraph/dgraph ~/go/bin/dgraph - # run the core upgrade tests - go test -v -timeout=120m -failfast -tags=upgrade \ - github.com/hypermodeinc/dgraph/v25/acl \ - github.com/hypermodeinc/dgraph/v25/worker \ - github.com/hypermodeinc/dgraph/v25/query - # clean up docker containers after test execution - go clean -testcache - # sleep - sleep 5 diff --git a/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml b/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml index 2af9178bc9b..525be99a30b 100644 --- a/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml +++ b/.github/workflows/ci-dgraph-weekly-upgrade-tests.yml @@ -107,3 +107,38 @@ jobs: go clean -testcache # sleep sleep 5 + + dgraph-upgrade-tests-core: + runs-on: blacksmith-16vcpu-ubuntu-2404 + timeout-minutes: 60 + steps: + - uses: actions/checkout@v5 + with: + fetch-depth: 0 + - name: Set up Go + uses: actions/setup-go@v6 + with: + go-version-file: go.mod + - name: Make Linux Build and Docker Image + run: make docker-image + - name: Clean Up Environment + run: | + #!/bin/bash + # clean cache + go clean -testcache + - name: Run Core Upgrade Tests + run: | + #!/bin/bash + # go env settings + export GOPATH=~/go + # move the binary + cp dgraph/dgraph ~/go/bin/dgraph + # run the core upgrade tests + go test -v -timeout=120m -failfast -tags=upgrade \ + github.com/hypermodeinc/dgraph/v25/acl \ + github.com/hypermodeinc/dgraph/v25/worker \ + github.com/hypermodeinc/dgraph/v25/query + # clean up docker containers after test execution + go clean -testcache + # sleep + sleep 5