Skip to content

Commit 046b43f

Browse files
hooray03hooray03
committed
revert: restore image build repository names
1 parent 4f41b6e commit 046b43f

8 files changed

Lines changed: 26 additions & 31 deletions

File tree

‎.github/configs/ascend.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ image_build:
4949
tasks:
5050
train:
5151
dockerfile: docker/ascend/Dockerfile.train
52-
image: flagscale-train
52+
image: flagos-dev/flagscale-train
5353
test_roles: [train]
5454
base_image: harbor.baai.ac.cn/flagos-dev/megatron-lm-fl:manual-20260717-ascend-dev@sha256:1384b5cb596c3e1012c9f9fca64ed9e2960e27addc73b17704b3c1abcaf1fa02
5555
build_args:
@@ -59,7 +59,7 @@ image_build:
5959
FLAGSCALE_MEGATRON_REF: megatron_lm_fl
6060
inference:
6161
dockerfile: docker/ascend/Dockerfile.inference
62-
image: flagscale-inference
62+
image: flagos-dev/flagscale-inference
6363
test_roles: [inference]
6464
base_image: harbor.baai.ac.cn/flagos-dev/flagscale:manual-20260812-ascend-dev-inference@sha256:e5b8e3b2c37584f980dffa1c08649b44e9edd2415522e123502e8d82a7854ef1
6565
build_args: {}
@@ -68,7 +68,7 @@ image_build:
6868
FLAGGEMS_REF: flaggems
6969
all:
7070
dockerfile: docker/ascend/Dockerfile.all
71-
image: flagscale-all
71+
image: flagos-dev/flagscale-all
7272
test_roles: [train, inference]
7373
base_image: harbor.baai.ac.cn/flagos-dev/flagscale:manual-20260812-ascend-dev-inference@sha256:e5b8e3b2c37584f980dffa1c08649b44e9edd2415522e123502e8d82a7854ef1
7474
build_args:

‎.github/configs/cuda.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ image_build:
4040
tasks:
4141
train:
4242
dockerfile: docker/cuda/Dockerfile.train
43-
image: flagscale-train
43+
image: flagos-dev/flagscale-train
4444
base_image: nvidia/cuda:12.8.1-devel-ubuntu22.04
4545
test_roles: [train]
4646
build_args:
@@ -55,7 +55,7 @@ image_build:
5555
FLAGSCALE_TE_REF: transformer_engine_fl
5656
inference:
5757
dockerfile: docker/cuda/Dockerfile.inference
58-
image: flagscale-inference
58+
image: flagos-dev/flagscale-inference
5959
base_image: nvidia/cuda:12.8.1-devel-ubuntu22.04
6060
test_roles: [inference]
6161
build_args:
@@ -67,7 +67,7 @@ image_build:
6767
PYTORCH_INDEX: https://download.pytorch.org/whl/cu128
6868
all:
6969
dockerfile: docker/cuda/Dockerfile.all
70-
image: flagscale-all
70+
image: flagos-dev/flagscale-all
7171
base_image: nvidia/cuda:12.8.1-devel-ubuntu22.04
7272
test_roles: [train, inference]
7373
test_environments:

‎.github/configs/metax.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ image_build:
4949
tasks:
5050
train:
5151
dockerfile: docker/metax/Dockerfile.train
52-
image: flagscale-train
52+
image: flagos-dev/flagscale-train
5353
test_roles: [train]
5454
base_image: harbor.baai.ac.cn/flagscale/megatron-lm-with-te@sha256:c6bc75f8512a3ba385339a536a33dfc1dcbeb0c42b6ca1e2d5f0f0e4e9d6200f
5555
build_args: {}
@@ -58,14 +58,14 @@ image_build:
5858
FLAGSCALE_TE_REF: transformer_engine_fl
5959
inference:
6060
dockerfile: docker/metax/Dockerfile.inference
61-
image: flagscale-inference
61+
image: flagos-dev/flagscale-inference
6262
test_roles: [inference]
6363
base_image: harbor.baai.ac.cn/flagos-dev/vllm-plugin-fl@sha256:c83a7b26e5b72fcffa920f32929a76984c78d5ee5520828b6e50feb9864240ed
6464
source_refs:
6565
VLLM_PLUGIN_FL_REF: vllm_plugin_fl
6666
all:
6767
dockerfile: docker/metax/Dockerfile.all
68-
image: flagscale-all
68+
image: flagos-dev/flagscale-all
6969
test_roles: [train, inference]
7070
base_image: harbor.baai.ac.cn/flagos-dev/flagscale-inference:86c8e54-metax-dev@sha256:8d9a8ac56cb127eb4fee94e2c14da1fe9cd3cd0b0d70d8875ca5edf46b9c4a65
7171
build_args:

‎.github/configs/musa.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ image_build:
4242
tasks:
4343
train:
4444
dockerfile: docker/musa/Dockerfile.train
45-
image: flagscale-train
45+
image: flagos-dev/flagscale-train
4646
base_image: harbor.baai.ac.cn/flagos-dev/transformerengine-fl@sha256:fb56b8b2882d20de45954ed0d53fd695ae08a23c808d853dae9e57f4fcae618e
4747
runtime_smoke_nproc: '2'
4848
test_roles: [train]
@@ -55,7 +55,7 @@ image_build:
5555
FLAGSCALE_MEGATRON_REF: megatron_lm_fl
5656
inference:
5757
dockerfile: docker/musa/Dockerfile.inference
58-
image: flagscale-inference
58+
image: flagos-dev/flagscale-inference
5959
base_image: harbor.baai.ac.cn/flagos-dev/transformerengine-fl@sha256:fb56b8b2882d20de45954ed0d53fd695ae08a23c808d853dae9e57f4fcae618e
6060
runtime_smoke_nproc: '2'
6161
test_roles: [inference]
@@ -65,7 +65,7 @@ image_build:
6565
PIP_DEFAULT_TIMEOUT: '300'
6666
all:
6767
dockerfile: docker/musa/Dockerfile.all
68-
image: flagscale-all
68+
image: flagos-dev/flagscale-all
6969
base_image: harbor.baai.ac.cn/flagos-dev/transformerengine-fl@sha256:fb56b8b2882d20de45954ed0d53fd695ae08a23c808d853dae9e57f4fcae618e
7070
runtime_smoke_nproc: '2'
7171
test_roles: [train, inference]

‎.github/configs/template.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ image_build:
6161
tasks:
6262
train:
6363
dockerfile: docker/my_hardware/Dockerfile.train
64-
# Repository basename only. The common workflow publishes it as:
65-
# ${registry}/flagos-dev/${image}:${short_sha}-${platform}-dev
66-
image: flagscale-train
64+
image: flagos-dev/flagscale-train
6765
base_image: registry.example.com/vendor/train-base:tag
6866
build_args: {}
6967
# Map Docker build argument names to entries in image_sources.yml.

‎.github/workflows/build_image.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,10 @@ jobs:
245245
echo "::error::Incomplete image task contract: ${platform}/${task}"
246246
exit 1
247247
fi
248-
if [[ ! "$image" =~ ^[a-z0-9][a-z0-9._-]*[a-z0-9]$ ]]; then
249-
echo "::error::Invalid image name for ${platform}/${task}: $image"
248+
if [[ ! "$image" =~ ^[a-z0-9][a-z0-9._/-]*[a-z0-9]$ ]] || \
249+
[[ "$image" == *//* ]] || [[ "$image" == *:* ]] || \
250+
[[ "$image" == *@* ]]; then
251+
echo "::error::Invalid image repository for ${platform}/${task}: $image"
250252
exit 1
251253
fi
252254
if [[ ! "$target_value" =~ ^[A-Za-z0-9_.-]+$ ]]; then

‎.github/workflows/build_image_common.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,10 @@ jobs:
277277
done
278278
fi
279279
280-
if [[ ! "$image_name" =~ ^[a-z0-9][a-z0-9._-]*[a-z0-9]$ ]]; then
281-
echo "::error::Invalid image name for ${PLATFORM}/${task}: $image_name"
280+
if [[ ! "$image_name" =~ ^[a-z0-9][a-z0-9._/-]*[a-z0-9]$ ]] || \
281+
[[ "$image_name" == *//* ]] || [[ "$image_name" == *:* ]] || \
282+
[[ "$image_name" == *@* ]]; then
283+
echo "::error::Invalid image repository for ${PLATFORM}/${task}: $image_name"
282284
exit 1
283285
fi
284286
@@ -316,7 +318,7 @@ jobs:
316318
'to_entries[] |
317319
"| `\(.key)` | `\(.value.selector)` | `\(.value.revision)` |"' \
318320
<<< "$source_metadata")
319-
candidate="${registry}/flagos-dev/${image_name}:${short_sha}-${PLATFORM}-dev"
321+
candidate="${registry}/${image_name}:${short_sha}-${PLATFORM}-${target}"
320322
entry=$(jq -c \
321323
--arg registry "$registry" \
322324
--arg image "$candidate" \

‎tests/unit_tests/test_resolve_source_refs.py‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ def test_platform_source_refs_use_catalog(platform):
7676
validation_path = root / validation_script
7777
assert validation_path.is_file()
7878
for task_name, task in config["image_build"]["tasks"].items():
79-
assert re.fullmatch(r"[a-z0-9][a-z0-9._-]*[a-z0-9]", task["image"])
79+
assert re.fullmatch(r"[a-z0-9][a-z0-9._/-]*[a-z0-9]", task["image"])
80+
assert "//" not in task["image"]
81+
assert ":" not in task["image"]
82+
assert "@" not in task["image"]
8083
if task_name != "all":
8184
assert (root / f"requirements/{platform}/{task_name}.txt").is_file()
8285
assert (root / f"tools/install/{platform}/install_{task_name}.sh").is_file()
@@ -89,16 +92,6 @@ def test_platform_source_refs_use_catalog(platform):
8992
assert re.search(rf"^ARG {build_arg}(?:=|$)", dockerfile, re.MULTILINE)
9093

9194

92-
def test_dev_image_name_matches_harbor_governance_contract():
93-
root = Path(__file__).parents[2]
94-
workflow = (root / ".github/workflows/build_image_common.yml").read_text()
95-
96-
assert (
97-
'candidate="${registry}/flagos-dev/${image_name}:'
98-
'${short_sha}-${PLATFORM}-dev"' in workflow
99-
)
100-
101-
10295
@pytest.mark.parametrize("platform", ["cuda", "musa", "ascend", "metax"])
10396
def test_split_runtime_all_images_have_explicit_task_environments(platform):
10497
root = Path(__file__).parents[2]

0 commit comments

Comments
 (0)