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 c47f5474fb28a0e57a725c40dba69a1d8c86c77e Author: Andrew Reusch <[email protected]> AuthorDate: Fri May 13 14:05:49 2022 -0700 freeze py deps --- Jenkinsfile | 38 ++++++++++---------------------------- jenkins/Jenkinsfile.j2 | 22 +++++++++------------- 2 files changed, 19 insertions(+), 41 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9a9a31324c..7b012c5e43 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:06.158241 +// Generated at 2022-05-13T17:18:11.741466 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -397,36 +397,18 @@ def build_image(arch_name, image_name) { } if (rebuild_docker_images) { + stage('Freeze Python Dependencies') { + node('CPU') { + timeout(time: max_time, unit: 'MINUTES') { + init_git() + freeze_python_deps() + } + } + } + stage('Docker Image Build') { // TODO in a follow up PR: Find ecr tag and use in subsequent builds - parallel( - 'aarch64': { - node('ARM') { - timeout(time: max_time, unit: 'MINUTES') { - init_git() - build_base_image('aarch64') - } - } - }, - 'x86': { - node('CPU') { - timeout(time: max_time, unit: 'MINUTES') { - init_git() - build_base_image('x86') - } - } - }, - 'x86_64': { - node('CPU') { - timeout(time: max_time, unit: 'MINUTES') { - init_git() - build_base_image('x86_64') - } - } - }, - ) - parallel( 'ci_arm': { node('ARM') { diff --git a/jenkins/Jenkinsfile.j2 b/jenkins/Jenkinsfile.j2 index 56e6aea353..78f2a3b3a4 100644 --- a/jenkins/Jenkinsfile.j2 +++ b/jenkins/Jenkinsfile.j2 @@ -314,22 +314,18 @@ def build_image(arch_name, image_name) { } if (rebuild_docker_images) { + stage('Freeze Python Dependencies') { + node('CPU') { + timeout(time: max_time, unit: 'MINUTES') { + init_git() + freeze_python_deps() + } + } + } + stage('Docker Image Build') { // TODO in a follow up PR: Find ecr tag and use in subsequent builds - parallel( - {% for arch, img in nodes_by_arch(images) %} - {{ ' ' }}'{{ arch }}': { - node('{{ img.platform }}') { - timeout(time: max_time, unit: 'MINUTES') { - init_git() - build_base_image('{{ arch }}') - } - } - }, - {% endfor %} - ) - parallel( {% for image in images %} '{{ image.name }}': {
