From 8b1a30977ee438e924f6ec450fcffd6f842918c5 Mon Sep 17 00:00:00 2001 From: Dennis Felsing Date: Tue, 9 Apr 2024 09:12:34 +0000 Subject: [PATCH] Use new buildkite pipeline names See https://github.com/MaterializeInc/materialize/pull/26502 for context --- .github/ISSUE_TEMPLATE/07-ci-flake.yml | 2 +- README.md | 2 +- ci/deploy/pipeline.template.yml | 4 ++-- ci/mkpipeline.py | 2 +- ci/release-qualification/pipeline.template.yml | 6 +++--- ci/test/pipeline.template.yml | 4 ++-- doc/developer/101-query-compilation.md | 2 +- doc/developer/code-coverage.md | 2 +- .../20230223_stabilize_with_mutually_recursive.md | 2 +- .../design/20230421_stabilize_monotonic_select.md | 2 +- doc/developer/feature-benchmark.md | 2 +- .../buildkite_insights/annotation_search/README.md | 10 +++++----- .../buildkite_api/buildkite_config.py | 8 ++++---- .../buildkite_insights/step_analysis/README.md | 6 +++--- .../buildkite_insights/step_analysis/analysis.py | 2 +- src/transform/src/fusion/join.rs | 2 +- test/mz-e2e/README.md | 2 +- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/07-ci-flake.yml b/.github/ISSUE_TEMPLATE/07-ci-flake.yml index 87dba4f8bc730..1b3149195d6eb 100644 --- a/.github/ISSUE_TEMPLATE/07-ci-flake.yml +++ b/.github/ISSUE_TEMPLATE/07-ci-flake.yml @@ -25,7 +25,7 @@ body: label: Buildkite link description: | Provide a link to the failed Buildkite job. - placeholder: https://buildkite.com/materialize/tests/builds/... + placeholder: https://buildkite.com/materialize/test/builds/... validations: required: true - type: textarea diff --git a/README.md b/README.md index a0809601b16bf..1384766b5f2da 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build status](https://badge.buildkite.com/97d6604e015bf633d1c2a12d166bb46f3b43a927d3952c999a.svg?branch=main)](https://buildkite.com/materialize/tests) +[![Build status](https://badge.buildkite.com/97d6604e015bf633d1c2a12d166bb46f3b43a927d3952c999a.svg?branch=main)](https://buildkite.com/materialize/test) [![Doc reference](https://img.shields.io/badge/doc-reference-orange)](https://materialize.com/docs) [![Chat on Slack](https://img.shields.io/badge/chat-on%20slack-purple)](https://materialize.com/s/chat) diff --git a/ci/deploy/pipeline.template.yml b/ci/deploy/pipeline.template.yml index 890629b68ff1b..0a1626526d5dc 100644 --- a/ci/deploy/pipeline.template.yml +++ b/ci/deploy/pipeline.template.yml @@ -38,7 +38,7 @@ steps: queue: linux-x86_64 - label: ":bulb: Full SQL Logic Tests" - trigger: sql-logic-tests + trigger: slt async: true branches: "v*.*rc*" build: @@ -48,7 +48,7 @@ steps: BUILDKITE_TAG: "$BUILDKITE_TAG" - label: ":nightmare: Full Nightly" - trigger: nightlies + trigger: nightly async: true branches: "v*.*rc*" build: diff --git a/ci/mkpipeline.py b/ci/mkpipeline.py index b147bb1d86a23..4255c23437f04 100644 --- a/ci/mkpipeline.py +++ b/ci/mkpipeline.py @@ -327,7 +327,7 @@ def add_version_to_preflight_tests(pipeline: Any) -> None: for step in steps(pipeline): if step.get("id", "") in ( "tests-preflight-check-rollback", - "nightlies-preflight-check-rollback", + "nightly-preflight-check-rollback", ): current_version = MzVersion.parse_cargo() version = get_previous_published_version( diff --git a/ci/release-qualification/pipeline.template.yml b/ci/release-qualification/pipeline.template.yml index ddbc34a24a526..47c39dc70ed21 100644 --- a/ci/release-qualification/pipeline.template.yml +++ b/ci/release-qualification/pipeline.template.yml @@ -169,18 +169,18 @@ steps: label: Tests with preflight check and rollback depends_on: [] skip: "TODO(def-): Too complex to adapt for all mzcompose-based tests" - trigger: tests + trigger: test async: false build: env: CI_FINAL_PREFLIGHT_CHECK_VERSION: "${BUILDKITE_TAG}" CI_FINAL_PREFLIGHT_CHECK_ROLLBACK: 1 - - id: nightlies-preflight-check-rollback + - id: nightly-preflight-check-rollback label: Nightlies with preflight check and rollback depends_on: [] skip: "TODO(def-): Too complex to adapt for all mzcompose-based tests" - trigger: nightlies + trigger: nightly async: false build: env: diff --git a/ci/test/pipeline.template.yml b/ci/test/pipeline.template.yml index f68116288bce9..a8f95773a3eeb 100644 --- a/ci/test/pipeline.template.yml +++ b/ci/test/pipeline.template.yml @@ -669,7 +669,7 @@ steps: - id: nightly-if-release label: Nightly for releases depends_on: devel-docker-tags - trigger: nightlies + trigger: nightly async: true build: commit: "$BUILDKITE_COMMIT" @@ -684,7 +684,7 @@ steps: label: Nightly for risky PRs skip: "Temporary disabled until a cost/beneft analysis" depends_on: devel-docker-tags - trigger: nightlies + trigger: nightly async: true build: commit: "$BUILDKITE_COMMIT" diff --git a/doc/developer/101-query-compilation.md b/doc/developer/101-query-compilation.md index 22e83f30a0082..1a18849f2b4a8 100644 --- a/doc/developer/101-query-compilation.md +++ b/doc/developer/101-query-compilation.md @@ -95,7 +95,7 @@ Currently, the optimization team is mostly concerned with the `HIR ⇒ MIR` and * A PR can be merged if it passes Fast SLT. * A PR does not need to pass Full SLT tests (`test/sqllogictest/sqlite`) to be merged. * Full SLT tests take 2-3 hours. - * You can manually initiate full SLT tests on your branch [here](https://buildkite.com/materialize/sql-logic-tests). + * You can manually initiate full SLT tests on your branch [here](https://buildkite.com/materialize/slt). * [Testdrive](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/testdrive.md) * We generally do not use testdrive except to see [linear operators in action](https://github.com/MaterializeInc/materialize/blob/main/test/testdrive/source-linear-operators.td). diff --git a/doc/developer/code-coverage.md b/doc/developer/code-coverage.md index 26210a5aacb7f..1e67167b8bd3b 100644 --- a/doc/developer/code-coverage.md +++ b/doc/developer/code-coverage.md @@ -26,7 +26,7 @@ Additionally you can also download the full coverage report in HTML format from ## Limitations -The [Coverage](https://buildkite.com/materialize/coverage/builds) Buildkite pipeline runs a subset of tests from the [Tests](https://buildkite.com/materialize/tests) pipeline, which is already automatically run against each pull request. The excluded tests are marked with a `coverage: skip` in the [`pipeline.template.yml`](https://github.com/MaterializeInc/materialize/blob/main/ci/test/pipeline.template.yml): +The [Coverage](https://buildkite.com/materialize/coverage/builds) Buildkite pipeline runs a subset of tests from the [Test](https://buildkite.com/materialize/test) pipeline, which is already automatically run against each pull request. The excluded tests are marked with a `coverage: skip` in the [`pipeline.template.yml`](https://github.com/MaterializeInc/materialize/blob/main/ci/test/pipeline.template.yml): - Miri test: Subset of cargo test, no additional use - Maelstrom coverage of persist: Randomized testing probably shouldn't count for coverage, not stable diff --git a/doc/developer/design/20230223_stabilize_with_mutually_recursive.md b/doc/developer/design/20230223_stabilize_with_mutually_recursive.md index c5d9d28ca346a..2fc654806fcc9 100644 --- a/doc/developer/design/20230223_stabilize_with_mutually_recursive.md +++ b/doc/developer/design/20230223_stabilize_with_mutually_recursive.md @@ -207,7 +207,7 @@ We can invest time proportional to the complexity of the transform to ensure tha 1. **Integration tests.** We will add test scenarios inspired by the use cases of our prospects as end-to-end `*.slt` tests. -We will also add at least one long-running `mzcompose` test runs [as part of our nightly tests](https://buildkite.com/materialize/nightlies) and is used when qualifying future releases. +We will also add at least one long-running `mzcompose` test runs [as part of our nightly tests](https://buildkite.com/materialize/nightly) and is used when qualifying future releases. As those tests will include expected results, it will be great if we have a reference external iteration driver for the semantics proposed in the original design doc[^wmr]. That way we can cross-check the results of the reference and the internal implementation of WMR support and ensure that both produce equal results. We can implement such driver in Python and integrate it in our `mzcompose` tests. diff --git a/doc/developer/design/20230421_stabilize_monotonic_select.md b/doc/developer/design/20230421_stabilize_monotonic_select.md index fd01d58f7a19d..3bdc8b0bbb0af 100644 --- a/doc/developer/design/20230421_stabilize_monotonic_select.md +++ b/doc/developer/design/20230421_stabilize_monotonic_select.md @@ -133,7 +133,7 @@ Among the work items to stabilize monotonic one-shot `SELECT`s, this is the leas As mentioned previously, the feature is now gated behind the flag `enable_monotonic_oneshot_selects`. The proposals in this document assume that we would like to eventually retire this feature flag. Based on this observation, the following lifecycle is proposed: -* Once MaterializeInc/materialize#18734 is tackled, we can let the feature be continuously tested in CI and nightlies during at least 2 weeks. +* Once MaterializeInc/materialize#18734 is tackled, we can let the feature be continuously tested in CI and nightly during at least 2 weeks. * Given the work in MaterializeInc/materialize#19223, we can enable the flag in staging once initial validation through testing succeeds. Ideally, we should let people experiment with the feature in staging for 1-2 weeks. Note that a full solution to MaterializeInc/materialize#18089 would be ideal to eliminate confusion regarding `EXPLAIN` behavior and make the feature more understandable to customers in production. * We consider solutions to MaterializeInc/materialize#18732 and MaterializeInc/materialize#18890 as highly desirable work items that bring about performance improvements for this feature. We can consider these improvements, however, optional wrt. enablement of the feature in staging. It would be ideal to tackle at a minimum MaterializeInc/materialize#18890 before enabling the feature in production, as we observed potential regressions in simple plans (e.g., for `MIN`/`MAX` over an entire collection) that would be ameliorated by a fix. If any of these fixes lands after the observation period for the previous two bullet points, we propose an additional 1 week of observation in staging and CI for derisking. * Once the feature is enabled in production, we can monitor for 1-2 weeks, and then plan the retirement of the feature flag in the next release cycle. diff --git a/doc/developer/feature-benchmark.md b/doc/developer/feature-benchmark.md index 63ea72bc15e7c..05bf206ed26f8 100644 --- a/doc/developer/feature-benchmark.md +++ b/doc/developer/feature-benchmark.md @@ -59,7 +59,7 @@ interference of any defaults that may be in effect and that can change over time ## Running manually in Buildkite -Go to the [Buildkite Nightly Job](https://buildkite.com/materialize/nightlies), click the down arrow button +Go to the [Buildkite Nightly Job](https://buildkite.com/materialize/nightly), click the down arrow button at the top right and select `New Build`. Put the **full SHA** of your commit in `Commit` and the name of your branch in `Branch` including the Github username you forked with, e.g. `username:branch`. Click `Create Build` and wait for the build start, at which point you will diff --git a/misc/python/materialize/buildkite_insights/annotation_search/README.md b/misc/python/materialize/buildkite_insights/annotation_search/README.md index 5f21ba0e8e8e7..910fbb7589833 100644 --- a/misc/python/materialize/buildkite_insights/annotation_search/README.md +++ b/misc/python/materialize/buildkite_insights/annotation_search/README.md @@ -5,7 +5,7 @@ This tool allows searching Buildkite annotations in recent builds. ## Usage ``` usage: buildkite-annotation-search [-h] --pipeline - {cleanup,coverage,deploy,deploy-lsp,deploy-mz,deploy-website,license,nightlies,release-qualification,security,sql-logic-tests,tests,www} + {cleanup,coverage,deploy,deploy-mz-lsp-server,deploy-mz,deploy-website,license,nightly,release-qualification,security,slt,test,www} [--branch BRANCH] [--fetch-builds {auto,always,never}] [--fetch-annotations {auto,always,never}] [--max-build-fetches MAX_BUILD_FETCHES] [--first-build-page-to-fetch FIRST_BUILD_PAGE_TO_FETCH] [--max-results MAX_RESULTS] [--only-one-result-per-build] [--only-failed-builds] @@ -18,23 +18,23 @@ usage: buildkite-annotation-search [-h] --pipeline Builds that have an annotation containing `Error { kind: Db, cause: Some(DbError` ``` -bin/buildkite-annotation-search --pipeline tests "Error { kind: Db, cause: Some(DbError" +bin/buildkite-annotation-search --pipeline test "Error { kind: Db, cause: Some(DbError" ``` Builds that have an annotation containing `Error` and include a larger number of recent builds ``` -bin/buildkite-annotation-search --pipeline tests --max-build-fetches 10 "Error" +bin/buildkite-annotation-search --pipeline test --max-build-fetches 10 "Error" ``` Builds on branch `main` that have an annotation matching the regex pattern `cannot serve requested as_of AntiChain.*testdrive-materialized-1` ``` -bin/buildkite-annotation-search --pipeline tests --branch main --use-regex "cannot serve requested as_of AntiChain.*testdrive-materialized-1" +bin/buildkite-annotation-search --pipeline test --branch main --use-regex "cannot serve requested as_of AntiChain.*testdrive-materialized-1" ``` Nightly builds that failed and have an annotation containing `fivetran-destination action=describe` ``` -bin/buildkite-annotation-search --pipeline nightlies --only-failed-builds "fivetran-destination action=describe" +bin/buildkite-annotation-search --pipeline nightly --only-failed-builds "fivetran-destination action=describe" ``` diff --git a/misc/python/materialize/buildkite_insights/buildkite_api/buildkite_config.py b/misc/python/materialize/buildkite_insights/buildkite_api/buildkite_config.py index 629e44f575bdf..0ff40f05a64fd 100755 --- a/misc/python/materialize/buildkite_insights/buildkite_api/buildkite_config.py +++ b/misc/python/materialize/buildkite_insights/buildkite_api/buildkite_config.py @@ -14,14 +14,14 @@ "cleanup", "coverage", "deploy", - "deploy-lsp", + "deploy-mz-lsp-server", "deploy-mz", "deploy-website", "license", - "nightlies", + "nightly", "release-qualification", "security", - "sql-logic-tests", - "tests", + "slt", + "test", "www", ] diff --git a/misc/python/materialize/buildkite_insights/step_analysis/README.md b/misc/python/materialize/buildkite_insights/step_analysis/README.md index 0d0fb0aef2532..f03c6229537a0 100644 --- a/misc/python/materialize/buildkite_insights/step_analysis/README.md +++ b/misc/python/materialize/buildkite_insights/step_analysis/README.md @@ -7,7 +7,7 @@ This tool allows searching recent Buildkite builds to ## Usage ``` usage: buildkite-step-durations [-h] - [--pipeline {cleanup,coverage,deploy,deploy-lsp,deploy-mz,deploy-website,license,nightlies,release-qualification,security,sql-logic-tests,tests,www}] + [--pipeline {cleanup,coverage,deploy,deploy-mz-lsp-server,deploy-mz,deploy-website,license,nightly,release-qualification,security,slt,test,www}] [--build-step-key BUILD_STEP_KEY] [--fetch {auto,always,never}] [--max-fetches MAX_FETCHES] @@ -22,13 +22,13 @@ usage: buildkite-step-durations [-h] Recent executions of build step "AWS (Localstack)" in Nightly on all branches ``` -bin/buildkite-step-insights --pipeline nightlies --build-step-key "aws-localstack" --branch "*" +bin/buildkite-step-insights --pipeline nightly --build-step-key "aws-localstack" --branch "*" ``` Recent failures of build step "AWS (Localstack)" in Nightly on `main` branch ``` -bin/buildkite-step-insights --pipeline nightlies --build-step-key "aws-localstack" --branch main --build-step-state "failed" +bin/buildkite-step-insights --pipeline nightly --build-step-key "aws-localstack" --branch main --build-step-state "failed" ``` Many recent executions of build step "Cargo test" on `main` branch in builds that failed due to any step diff --git a/misc/python/materialize/buildkite_insights/step_analysis/analysis.py b/misc/python/materialize/buildkite_insights/step_analysis/analysis.py index fbbe7fa7e8480..b373a98dabdb4 100755 --- a/misc/python/materialize/buildkite_insights/step_analysis/analysis.py +++ b/misc/python/materialize/buildkite_insights/step_analysis/analysis.py @@ -135,7 +135,7 @@ def main( formatter_class=argparse.RawDescriptionHelpFormatter, ) - parser.add_argument("--pipeline", choices=MZ_PIPELINES, default="tests", type=str) + parser.add_argument("--pipeline", choices=MZ_PIPELINES, default="test", type=str) parser.add_argument("--build-step-key", action="append", default=[], type=str) parser.add_argument( "--fetch", diff --git a/src/transform/src/fusion/join.rs b/src/transform/src/fusion/join.rs index b94e1d78a84ae..93c9ec22772fe 100644 --- a/src/transform/src/fusion/join.rs +++ b/src/transform/src/fusion/join.rs @@ -63,7 +63,7 @@ impl crate::Transform for Join { // // TODO(#25918): This is a temporary solution which fixes the "Product // limits" issue observed in a failed Nightly run when the PR was first - // tested (https://buildkite.com/materialize/nightlies/builds/6670). We + // tested (https://buildkite.com/materialize/nightly/builds/6670). We // should re-evaluate if we need this ad-hoc re-normalization step when // LiteralLifting is removed in favor of EquivalencePropagation. if transformed { diff --git a/test/mz-e2e/README.md b/test/mz-e2e/README.md index 6218549fae1ea..b3a3bac0e452f 100644 --- a/test/mz-e2e/README.md +++ b/test/mz-e2e/README.md @@ -4,7 +4,7 @@ Mz test runs multiple commands to test the `mz` CLI. # Usage -The mz-e2e is made to run alone and during nightlies. +The mz-e2e is made to run alone and during nightly. # Running