From 4ff0a15456a2238b3c3547426b379c16c5cdeb94 Mon Sep 17 00:00:00 2001 From: Tristan Konolige Date: Wed, 12 May 2021 16:55:16 -0700 Subject: [PATCH 1/5] [CI] Updated docker images --- Jenkinsfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a2f1017b66a0..96db388d0792 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,13 +44,13 @@ // // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> -ci_lint = "tlcpack/ci-lint:v0.62" -ci_gpu = "tlcpack/ci-gpu:v0.72" -ci_cpu = "tlcpack/ci-cpu:v0.73" -ci_wasm = "tlcpack/ci-wasm:v0.70" -ci_i386 = "tlcpack/ci-i386:v0.72-t0" -ci_qemu = "tlcpack/ci-qemu:v0.04" -ci_arm = "tlcpack/ci-arm:v0.03" +ci_lint = "tkonolige/ci-lint:latest" +ci_gpu = "tkonolige/ci-gpu:latest" +ci_cpu = "tkonolige/ci-cpu:latest" +ci_wasm = "tkonolige/ci-wasm:latest" +ci_i386 = "tkonolige/ci-i386:latest" +ci_qemu = "tkonolige/ci-qemu:latest" +ci_arm = "tkonolige/ci-arm:latest" // <--- End of regex-scanned config. // tvm libraries From d4451ff474bab79e89c6471dde4bcbc539f9b14a Mon Sep 17 00:00:00 2001 From: Tristan Konolige Date: Wed, 12 May 2021 17:25:11 -0700 Subject: [PATCH 2/5] fixes to build images --- docker/Dockerfile.ci_gpu | 8 ++++---- docker/Dockerfile.ci_i386 | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu index 96324c4a68fc..f6838975332b 100644 --- a/docker/Dockerfile.ci_gpu +++ b/docker/Dockerfile.ci_gpu @@ -25,11 +25,11 @@ RUN apt-get update --fix-missing COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh RUN bash /install/ubuntu_install_core.sh -COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh -RUN bash /install/ubuntu_install_python.sh +COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh +RUN bash /install/ubuntu1804_install_python.sh -COPY install/ubuntu_install_llvm.sh /install/ubuntu_install_llvm.sh -RUN bash /install/ubuntu_install_llvm.sh +COPY install/ubuntu1804_install_llvm.sh /install/ubuntu1804_install_llvm.sh +RUN bash /install/ubuntu1804_install_llvm.sh COPY install/ubuntu_install_opencl.sh /install/ubuntu_install_opencl.sh RUN bash /install/ubuntu_install_opencl.sh diff --git a/docker/Dockerfile.ci_i386 b/docker/Dockerfile.ci_i386 index 2cdf10c4369e..2383f4675e37 100644 --- a/docker/Dockerfile.ci_i386 +++ b/docker/Dockerfile.ci_i386 @@ -20,8 +20,7 @@ FROM ioft/i386-ubuntu:16.04 -RUN apt-get update --fix-missing -RUN apt-get install -y ca-certificates +RUN apt-get update --fix-missing && apt-get install -y ca-certificates COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh RUN bash /install/ubuntu_install_core.sh From e6452f1f29fc9e0a1a1ccc46b70940cc345e9bfe Mon Sep 17 00:00:00 2001 From: Tristan Konolige Date: Thu, 13 May 2021 09:30:12 -0700 Subject: [PATCH 3/5] fix arm image version --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 96db388d0792..3a6d7b27d761 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,7 +50,7 @@ ci_cpu = "tkonolige/ci-cpu:latest" ci_wasm = "tkonolige/ci-wasm:latest" ci_i386 = "tkonolige/ci-i386:latest" ci_qemu = "tkonolige/ci-qemu:latest" -ci_arm = "tkonolige/ci-arm:latest" +ci_arm = "tkonolige/ci-arm:v0.04" // <--- End of regex-scanned config. // tvm libraries From e4e45e4e4b7b26045f02be384b46907647deb39b Mon Sep 17 00:00:00 2001 From: Tristan Konolige Date: Thu, 13 May 2021 12:30:42 -0700 Subject: [PATCH 4/5] update qemu --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3a6d7b27d761..8e13bed085f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ ci_gpu = "tkonolige/ci-gpu:latest" ci_cpu = "tkonolige/ci-cpu:latest" ci_wasm = "tkonolige/ci-wasm:latest" ci_i386 = "tkonolige/ci-i386:latest" -ci_qemu = "tkonolige/ci-qemu:latest" +ci_qemu = "areusch1/ci-qemu-staging:v0.05" ci_arm = "tkonolige/ci-arm:v0.04" // <--- End of regex-scanned config. From a304723b2c306d125bbda4585362d2190575b18a Mon Sep 17 00:00:00 2001 From: Tristan Konolige Date: Thu, 13 May 2021 15:05:28 -0700 Subject: [PATCH 5/5] reset jenkinsfile --- Jenkinsfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e13bed085f6..a2f1017b66a0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,13 +44,13 @@ // // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> -ci_lint = "tkonolige/ci-lint:latest" -ci_gpu = "tkonolige/ci-gpu:latest" -ci_cpu = "tkonolige/ci-cpu:latest" -ci_wasm = "tkonolige/ci-wasm:latest" -ci_i386 = "tkonolige/ci-i386:latest" -ci_qemu = "areusch1/ci-qemu-staging:v0.05" -ci_arm = "tkonolige/ci-arm:v0.04" +ci_lint = "tlcpack/ci-lint:v0.62" +ci_gpu = "tlcpack/ci-gpu:v0.72" +ci_cpu = "tlcpack/ci-cpu:v0.73" +ci_wasm = "tlcpack/ci-wasm:v0.70" +ci_i386 = "tlcpack/ci-i386:v0.72-t0" +ci_qemu = "tlcpack/ci-qemu:v0.04" +ci_arm = "tlcpack/ci-arm:v0.03" // <--- End of regex-scanned config. // tvm libraries