This is an automated email from the ASF dual-hosted git repository. areusch pushed a commit to branch areusch/freeze-dependencies in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 6b71dc50b39358f17d94114f9dad280c67fcce8a Author: Andrew Reusch <[email protected]> AuthorDate: Fri May 13 16:55:33 2022 -0700 remove arch --- Jenkinsfile | 24 ++++++++++++------------ jenkins/Jenkinsfile.j2 | 8 ++++---- jenkins/generate.py | 11 +---------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 825b23e20d..e19ca26c11 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2022-05-13T17:18:18.841574 +// Generated at 2022-05-13T17:18:24.432075 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -339,17 +339,17 @@ def freeze_python_deps() { ) } finally { archiveArtifacts artifacts: "docker/python/build/**", fingerprint: true - pack_lib("${arch_name}-lockfiles", "docker/python/build/**") + pack_lib("python-lockfiles", "docker/python/build/**") } } -def build_image(arch_name, image_name) { +def build_image(image_name) { hash = sh( returnStdout: true, script: 'git log -1 --format=\'%h\'' ).trim() def full_name = "${image_name}:${env.BRANCH_NAME}-${hash}-${env.BUILD_NUMBER}" - unpack_lib("${arch_name}-lockfiles") + unpack_lib("python-lockfiles") sh( script: "${docker_build} ${image_name} --spec ${full_name}", label: 'Build docker image' @@ -417,7 +417,7 @@ if (rebuild_docker_images) { node('ARM') { timeout(time: max_time, unit: 'MINUTES') { init_git() - build_image('aarch64', 'ci_arm') + build_image('ci_arm') } } }, @@ -425,7 +425,7 @@ if (rebuild_docker_images) { node('CPU') { timeout(time: max_time, unit: 'MINUTES') { init_git() - build_image('x86_64', 'ci_cpu') + build_image('ci_cpu') } } }, @@ -433,7 +433,7 @@ if (rebuild_docker_images) { node('CPU') { timeout(time: max_time, unit: 'MINUTES') { init_git() - build_image('x86_64', 'ci_gpu') + build_image('ci_gpu') } } }, @@ -441,7 +441,7 @@ if (rebuild_docker_images) { node('CPU') { timeout(time: max_time, unit: 'MINUTES') { init_git() - build_image('x86_64', 'ci_hexagon') + build_image('ci_hexagon') } } }, @@ -449,7 +449,7 @@ if (rebuild_docker_images) { node('CPU') { timeout(time: max_time, unit: 'MINUTES') { init_git() - build_image('x86', 'ci_i386') + build_image('ci_i386') } } }, @@ -457,7 +457,7 @@ if (rebuild_docker_images) { node('CPU') { timeout(time: max_time, unit: 'MINUTES') { init_git() - build_image('x86_64', 'ci_lint') + build_image('ci_lint') } } }, @@ -465,7 +465,7 @@ if (rebuild_docker_images) { node('CPU') { timeout(time: max_time, unit: 'MINUTES') { init_git() - build_image('x86_64', 'ci_qemu') + build_image('ci_qemu') } } }, @@ -473,7 +473,7 @@ if (rebuild_docker_images) { node('CPU') { timeout(time: max_time, unit: 'MINUTES') { init_git() - build_image('x86_64', 'ci_wasm') + build_image('ci_wasm') } } }, diff --git a/jenkins/Jenkinsfile.j2 b/jenkins/Jenkinsfile.j2 index 782a115e2f..23bbc1e263 100644 --- a/jenkins/Jenkinsfile.j2 +++ b/jenkins/Jenkinsfile.j2 @@ -256,17 +256,17 @@ def freeze_python_deps() { ) } finally { archiveArtifacts artifacts: "docker/python/build/**", fingerprint: true - pack_lib("${arch_name}-lockfiles", "docker/python/build/**") + pack_lib("python-lockfiles", "docker/python/build/**") } } -def build_image(arch_name, image_name) { +def build_image(image_name) { hash = sh( returnStdout: true, script: 'git log -1 --format=\'%h\'' ).trim() def full_name = "${image_name}:${env.BRANCH_NAME}-${hash}-${env.BUILD_NUMBER}" - unpack_lib("${arch_name}-lockfiles") + unpack_lib("python-lockfiles") sh( script: "${docker_build} ${image_name} --spec ${full_name}", label: 'Build docker image' @@ -335,7 +335,7 @@ if (rebuild_docker_images) { node('{{ image.platform }}') { timeout(time: max_time, unit: 'MINUTES') { init_git() - build_image('{{ image.arch }}', '{{ image.name }}') + build_image('{{ image.name }}') } } }, diff --git a/jenkins/generate.py b/jenkins/generate.py index ad06948e40..011579c652 100644 --- a/jenkins/generate.py +++ b/jenkins/generate.py @@ -34,46 +34,37 @@ data = { "images": [ { "name": "ci_arm", - "arch": "aarch64", "platform": "ARM", }, { "name": "ci_cpu", - "arch": "x86_64", "platform": "CPU", }, { "name": "ci_gpu", - "arch": "x86_64", "platform": "CPU", }, { "name": "ci_hexagon", - "arch": "x86_64", "platform": "CPU", }, { "name": "ci_i386", - "arch": "x86", "platform": "CPU", }, { "name": "ci_lint", - "arch": "x86_64", "platform": "CPU", }, { "name": "ci_qemu", - "arch": "x86_64", "platform": "CPU", }, { "name": "ci_wasm", - "arch": "x86_64", "platform": "CPU", }, - ], - 'nodes_by_arch': lambda images: dict(sorted([(img['arch'], img) for img in images], key=lambda k: k[0])).items() + ] }
