Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ci/jenkins/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,31 +51,31 @@
# Docker Images
docker_images = {
"ci_arm": {
"tag": "tlcpack/ci-arm:20251130-061900-c429a2b1",
"tag": "tlcpack/ci-arm:20221013-060115-61c9742ea",
"platform": "ARM",
},
"ci_cpu": {
"tag": "tlcpack/ci-cpu:20251130-061900-c429a2b1",
"tag": "tlcpack/ci-cpu:20221013-060115-61c9742ea",
"platform": "CPU",
},
"ci_gpu": {
"tag": "tlcpack/ci-gpu:20251130-061900-c429a2b1",
"tag": "tlcpack/ci-gpu:20221019-060125-0b4836739",
"platform": "GPU",
},
"ci_hexagon": {
"tag": "tlcpack/ci-hexagon:20251130-061900-c429a2b1",
"tag": "tlcpack/ci-hexagon:20221013-060115-61c9742ea",
"platform": "CPU",
},
"ci_i386": {
"tag": "tlcpack/ci-i386:20251130-061900-c429a2b1",
"tag": "tlcpack/ci-i386:20221013-060115-61c9742ea",
"platform": "CPU",
},
"ci_lint": {
"tag": "tlcpack/ci-lint:20251130-061900-c429a2b1",
"tag": "tlcpack/ci-lint:20221013-060115-61c9742ea",
"platform": "CPU",
},
"ci_wasm": {
"tag": "tlcpack/ci-wasm:20251130-061900-c429a2b1",
"tag": "tlcpack/ci-wasm:20221013-060115-61c9742ea",
"platform": "CPU",
},
}
Comment on lines 52 to 81
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This revert is a good immediate fix. To address the underlying issue of duplicated image definitions that you mentioned in the PR description, you could refactor this to load the tags from ci/jenkins/docker-images.ini. This would make it the single source of truth and improve maintainability.

Here's a possible implementation for ci/jenkins/data.py:

import configparser
from pathlib import Path

# ... (other code)

# Docker Images
_DOCKER_IMAGE_PLATFORMS = {
    "ci_arm": "ARM",
    "ci_cpu": "CPU",
    "ci_gpu": "GPU",
    "ci_hexagon": "CPU",
    "ci_i386": "CPU",
    "ci_lint": "CPU",
    "ci_wasm": "CPU",
}

def _get_docker_images():
    # Assumes data.py and docker-images.ini are in the same directory
    docker_images_ini = Path(__file__).parent / "docker-images.ini"
    config = configparser.ConfigParser()
    config.read(docker_images_ini)
    
    docker_images = {}
    for name, platform in _DOCKER_IMAGE_PLATFORMS.items():
        tag = config.get("jenkins", name)
        docker_images[name] = {
            "tag": tag,
            "platform": platform,
        }
    return docker_images

docker_images = _get_docker_images()

This change would also require disabling or updating the open_docker_update_pr.py script to modify docker-images.ini instead of this file.

Note: There appears to be a typo in ci/jenkins/docker-images.ini where ci_cpu is listed as tlcpack/ci_cpu instead of tlcpack/ci-cpu.

Expand Down
Loading