add ci image build test

Signed-off-by: yangzeyu <532183776@qq.com>

Author: yzeyu71

.buildkite/README-NPU-CI.md

@@ -12,31 +12,46 @@ Three steps run in order:
 
 **`pre-commit-npu`** runs the pre-commit gate on all files, always.
 
-**`image-build-npu`** builds and pushes the NPU test image via buildctl/buildkit.
-It only runs when `Dockerfile.npu` has changed (PR trigger) or on a scheduled
-build — otherwise the step is skipped and the pre-built default image is used.
+**`npu-gate`** is a block step that pauses the pipeline for manual interaction.
+It appears only on PR triggers (`build.source != "schedule"`).  You select which
+NPU suites to run via a multi-select field:
+
+- **`image-build`** — triggers a fresh image build in the `image-build-npu` step;
+  when selected, `smk` is automatically included and all test steps use the newly
+  built image instead of the pre-built default.
+- **`smk`** — runs the smoke test suite.
+- **`nightly`** — runs the nightly test suite.
+
+**`image-build-npu`** the `image-build-npu` step will build and
+push a fresh NPU test image tagged with the current commit. When `image-build` 
+is selected, all test steps generated by `upload-npu-suites` use the newly built
+image instead of the pre-built default image.
+
+This allows testing code changes that require an updated NPU environment
+(e.g., modifications to `docker/Dockerfile.npu`) before they are merged.
 
 **`upload-npu-suites`** reads the `NPU_SUITES` environment variable (or
 `buildkite-agent meta-data get npu-suites` for PR triggers) and generates
 individual test jobs via [`npu_suites.py`](./npu_suites.py).
 
 ## Triggers
 
-The pipeline supports three trigger modes:
+The pipeline supports two trigger modes:
 
-**PR trigger.** On a PR trigger, the pre-built default image is used and
-test suites are selected manually via the block step.
+**PR trigger.** The `npu-gate` block step appears for manual suite selection.
+Suites not selected in the block step are skipped. The `image-build-npu` step
+builds a new image only when `image-build` is chosen in the block.
 
-**Schedule trigger.** On a scheduled build, a new image is always built
-regardless of file changes. The suites to run are determined by the
+**Schedule trigger.** There is no block step — the `npu-gate` step is omitted
+entirely. A new image is **always** built, and the suites are determined by the
 `NPU_SUITES` environment variable (set in the scheduled build's pipeline
-configuration), which selects the corresponding entries from the `SUITES` dict.
+configuration), which lists suite names from the `SUITES` dict.
 
 ## Adding a test
 
 Suites and test mappings are defined in [`npu_suites.py`](./npu_suites.py). Two
-suites are predefined — `smk` (always runs) and `nightly` (runs on schedule or
-with the `run-ci-npu-nightly` label).
+suites are predefined — `smk` (runs with the `run-ci-npu-smk` label) and `nightly`
+(runs on schedule or with the `run-ci-npu-nightly` label).
 
 Each entry is a 4-tuple:
 

.buildkite/npu_suites.py

@@ -23,6 +23,7 @@
 IMAGE_REGISTRY = "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry"
 IMAGE_NAME = "vime-ci-npu"
 VIME_IMAGE_TAG = os.environ.get("BUILDKITE_COMMIT", "latest")
+BUILDKITE_SOURCE = os.environ.get("BUILDKITE_SOURCE", "")
 
 # (test_name, resource_class, extra_args, env_overrides)
 SUITES = {
@@ -51,7 +52,7 @@ def _read_suite_values() -> list[str]:
 
 def _ci_image() -> str:
     values = _read_suite_values()
-    if "image-build" in values:
+    if ("image-build" in values) or (BUILDKITE_SOURCE == "schedule"):
         return f"{IMAGE_REGISTRY}/{IMAGE_NAME}:{VIME_IMAGE_TAG}"
     return DEFAULT_CI_IMAGE
 
@@ -61,6 +62,9 @@ def selected_suites() -> list:
     unknown = [v for v in values if v and v not in SUITES and v != "image-build"]
     if unknown:
         raise SystemExit(f"unknown suite(s) {unknown}; expected {sorted(SUITES)}")
+    if "image-build" in values:
+        # image-build auto-includes smk tests
+        values.extend("smk")
     return [s for s in SUITES if s in values]
 
 
@@ -118,7 +122,7 @@ def main() -> None:
     steps = [npu_step(suite, *entry) for suite in selected_suites() for entry in SUITES[suite]]
     json_str = json.dumps({"steps": steps}, indent=2)
 
-    print("--- Generated Pipeline JSON (debug):", file=sys.stderr)
+    print("--- Generated Pipeline JSON:", file=sys.stderr)
     print(json_str, file=sys.stderr)
 
     print(json_str)

.buildkite/pipeline-npu.yaml

@@ -45,7 +45,7 @@ steps:
             multiple: true
             required: true
             options:
-              - label: "run-npu-ci-image-build (test new image)"
+              - label: "run-npu-ci-image-build (test new image, auto include smk)"
                 value: image-build
               - label: "run-npu-ci-smk"
                 value: smk
@@ -104,7 +104,11 @@ steps:
         command: |
           set -ex
           NPU_SUITES=$$(buildkite-agent meta-data get "npu-suites" --default "")
-          if [[ "$$NPU_SUITES" != *"image-build"* ]]; then
+          if [[ "$$BUILDKITE_SOURCE" == "schedule" ]]; then
+            echo "Scheduled build — building the image."
+          elif [[ "$$NPU_SUITES" == *"image-build"* ]]; then
+            echo "image-build selected — building the image."
+          else
             echo "Skipping this step because image-build is not present in npu-suites."
             exit 0
           fi
@@ -150,7 +154,7 @@ steps:
         key: upload-npu-suites
         depends_on: 
           - npu-gate
-          - pre-commit-npu
+          - image-build-npu
         agents:
           queue: "ascend-a3"
           resource_class: "npu-2"