Skip to content

Commit 78b8339

Browse files
fix(release): forward metadata.prod_image into the release spec (#6350)
base and ray auto-releases fail at tag construction because the release logic derives their release tag from prod_image, but the generator never forwarded it. Emit prod_image so base_dlc/ray release without a hand-authored container_type field.
1 parent 3dd3ee5 commit 78b8339

9 files changed

Lines changed: 10 additions & 0 deletions

File tree

.github/actions/generate-release-spec/generate_release_spec.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ DEVICE_TYPE=$(yq '.metadata.device_type // ""' "$CONFIG_FILE")
3939
OS_VERSION=$(yq '.metadata.os_version // ""' "$CONFIG_FILE")
4040
CUSTOMER_TYPE=$(yq '.metadata.customer_type // ""' "$CONFIG_FILE")
4141
PLATFORM=$(yq '.metadata.platform // ""' "$CONFIG_FILE")
42+
CONTAINER_TYPE=$(yq '.metadata.container_type // ""' "$CONFIG_FILE")
4243

4344
# Derived fields
4445
PYTHON_RAW=$(yq '.build.python_version // ""' "$CONFIG_FILE")
@@ -84,6 +85,7 @@ SPEC+="version: \"${VERSION}\""$'\n'
8485
[[ -n "$CUDA_VERSION" ]] && SPEC+="cuda_version: \"${CUDA_VERSION}\""$'\n'
8586
[[ -n "$TRANSFORMERS_VERSION" ]] && SPEC+="transformers_version: \"${TRANSFORMERS_VERSION}\""$'\n'
8687
[[ -n "$PLATFORM" ]] && SPEC+="platform: \"${PLATFORM}\""$'\n'
88+
[[ -n "$CONTAINER_TYPE" ]] && SPEC+="container_type: \"${CONTAINER_TYPE}\""$'\n'
8789
[[ -n "$FORCE_RELEASE" ]] && SPEC+="force_release: ${FORCE_RELEASE}"$'\n'
8890
[[ -n "$PUBLIC_REGISTRY" ]] && SPEC+="public_registry: ${PUBLIC_REGISTRY}"$'\n'
8991
[[ -n "$PRIVATE_REGISTRY" ]] && SPEC+="private_registry: ${PRIVATE_REGISTRY}"$'\n'

.github/config/image/base/cu129-devel.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
arch_type: "x86"
1111
device_type: "gpu"
1212
job_type: "general"
13+
container_type: "devel"
1314
prod_image: "base:devel-cu129-amzn2023"
1415

1516
build:

.github/config/image/base/cu129-runtime.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
arch_type: "x86"
1111
device_type: "gpu"
1212
job_type: "general"
13+
container_type: "runtime"
1314
prod_image: "base:runtime-cu129-amzn2023"
1415

1516
build:

.github/config/image/base/cu130-devel.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
arch_type: "x86"
1111
device_type: "gpu"
1212
job_type: "general"
13+
container_type: "devel"
1314
prod_image: "base:devel-cu130-amzn2023"
1415

1516
build:

.github/config/image/base/cu130-runtime.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
arch_type: "x86"
1111
device_type: "gpu"
1212
job_type: "general"
13+
container_type: "runtime"
1314
prod_image: "base:runtime-cu130-amzn2023"
1415

1516
build:

.github/config/image/ray/ec2-cpu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
arch_type: "x86"
1111
device_type: "cpu"
1212
job_type: "inference"
13+
container_type: "serve-ml"
1314
prod_image: "ray:serve-ml-cpu"
1415

1516
build:

.github/config/image/ray/ec2-gpu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
arch_type: "x86"
1111
device_type: "gpu"
1212
job_type: "inference"
13+
container_type: "serve-ml"
1314
prod_image: "ray:serve-ml-cuda"
1415

1516
build:

.github/config/image/ray/sagemaker-cpu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ metadata:
1111
arch_type: "x86"
1212
device_type: "cpu"
1313
job_type: "inference"
14+
container_type: "serve-ml"
1415
prod_image: "ray:serve-ml-sagemaker-cpu"
1516

1617
build:

.github/config/image/ray/sagemaker-gpu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ metadata:
1111
arch_type: "x86"
1212
device_type: "gpu"
1313
job_type: "inference"
14+
container_type: "serve-ml"
1415
prod_image: "ray:serve-ml-sagemaker-cuda"
1516

1617
build:

0 commit comments

Comments
 (0)