From caa6ef58974c817d19b368baadb321394aa7d811 Mon Sep 17 00:00:00 2001 From: Andrew Reusch Date: Thu, 16 Jun 2022 16:39:14 -0700 Subject: [PATCH 1/2] Use the built image in the CI. --- Jenkinsfile | 18 +++++++++--------- jenkins/DockerBuild.groovy.j2 | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e284ee951c8..8168c9effbf6 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-06-10T12:12:40.419262 +// Generated at 2022-06-16T16:38:54.817151 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -392,7 +392,7 @@ def build_docker_images() { // We're purposefully not setting the built image here since they // are not yet being uploaded to tlcpack // ci_arm = build_image('ci_arm') - build_image('ci_arm') + ci_arm = build_image('ci_arm') } } }, @@ -403,7 +403,7 @@ def build_docker_images() { // We're purposefully not setting the built image here since they // are not yet being uploaded to tlcpack // ci_cpu = build_image('ci_cpu') - build_image('ci_cpu') + ci_cpu = build_image('ci_cpu') } } }, @@ -414,7 +414,7 @@ def build_docker_images() { // We're purposefully not setting the built image here since they // are not yet being uploaded to tlcpack // ci_gpu = build_image('ci_gpu') - build_image('ci_gpu') + ci_gpu = build_image('ci_gpu') } } }, @@ -425,7 +425,7 @@ def build_docker_images() { // We're purposefully not setting the built image here since they // are not yet being uploaded to tlcpack // ci_hexagon = build_image('ci_hexagon') - build_image('ci_hexagon') + ci_hexagon = build_image('ci_hexagon') } } }, @@ -436,7 +436,7 @@ def build_docker_images() { // We're purposefully not setting the built image here since they // are not yet being uploaded to tlcpack // ci_i386 = build_image('ci_i386') - build_image('ci_i386') + ci_i386 = build_image('ci_i386') } } }, @@ -447,7 +447,7 @@ def build_docker_images() { // We're purposefully not setting the built image here since they // are not yet being uploaded to tlcpack // ci_lint = build_image('ci_lint') - build_image('ci_lint') + ci_lint = build_image('ci_lint') } } }, @@ -458,7 +458,7 @@ def build_docker_images() { // We're purposefully not setting the built image here since they // are not yet being uploaded to tlcpack // ci_qemu = build_image('ci_qemu') - build_image('ci_qemu') + ci_qemu = build_image('ci_qemu') } } }, @@ -469,7 +469,7 @@ def build_docker_images() { // We're purposefully not setting the built image here since they // are not yet being uploaded to tlcpack // ci_wasm = build_image('ci_wasm') - build_image('ci_wasm') + ci_wasm = build_image('ci_wasm') } } }, diff --git a/jenkins/DockerBuild.groovy.j2 b/jenkins/DockerBuild.groovy.j2 index a0ff666773f7..c3209ee53efa 100644 --- a/jenkins/DockerBuild.groovy.j2 +++ b/jenkins/DockerBuild.groovy.j2 @@ -106,7 +106,7 @@ def build_docker_images() { // We're purposefully not setting the built image here since they // are not yet being uploaded to tlcpack // {{ image.name }} = build_image('{{ image.name }}') - build_image('{{ image.name }}') + {{ image.name }} = build_image('{{ image.name }}') } } }, From edfe97e63d6f3095f484225cb9f04891948644de Mon Sep 17 00:00:00 2001 From: Andrew Reusch Date: Thu, 16 Jun 2022 16:39:39 -0700 Subject: [PATCH 2/2] DNS test install --- docker/install/ubuntu_install_python.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/install/ubuntu_install_python.sh b/docker/install/ubuntu_install_python.sh index eff7504d4771..6e04160f9a90 100755 --- a/docker/install/ubuntu_install_python.sh +++ b/docker/install/ubuntu_install_python.sh @@ -43,3 +43,5 @@ wget -q https://bootstrap.pypa.io/get-pip.py && python3.7 get-pip.py # Pin pip and setuptools versions pip3 install pip==19.3.1 setuptools==58.4.0 + +echo hi