From c19538da12ed1a82d0f99a19834b98d0e77ecba8 Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Thu, 19 May 2022 15:44:27 +0900 Subject: [PATCH 1/3] validating new cpu and gpu image --- Jenkinsfile | 6 +++--- jenkins/Jenkinsfile.j2 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dbbbb29f7972..d037ef1b0e08 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,13 +45,13 @@ // '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-19T14:04:32.815769 +// Generated at 2022-05-19T15:44:16.656191 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> ci_lint = 'tlcpack/ci-lint:20220513-055910-fa834f67e' -ci_gpu = 'tlcpack/ci-gpu:20220513-055910-fa834f67e' -ci_cpu = 'tlcpack/ci-cpu:20220517-094028-de21c8f2e' +ci_gpu = 'tlcpackstaging/ci_gpu:20220519-055908-ddfa1da69' +ci_cpu = 'tlcpackstaging/ci_cpu:20220519-055908-ddfa1da69' ci_wasm = 'tlcpack/ci-wasm:20220513-055910-fa834f67e' ci_i386 = 'tlcpack/ci-i386:20220513-055910-fa834f67e' ci_qemu = 'tlcpack/ci-qemu:20220517-094028-de21c8f2e' diff --git a/jenkins/Jenkinsfile.j2 b/jenkins/Jenkinsfile.j2 index 9eac881c549a..397195cae0c3 100644 --- a/jenkins/Jenkinsfile.j2 +++ b/jenkins/Jenkinsfile.j2 @@ -52,8 +52,8 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> ci_lint = 'tlcpack/ci-lint:20220513-055910-fa834f67e' -ci_gpu = 'tlcpack/ci-gpu:20220513-055910-fa834f67e' -ci_cpu = 'tlcpack/ci-cpu:20220517-094028-de21c8f2e' +ci_gpu = 'tlcpackstaging/ci_gpu:20220519-055908-ddfa1da69' +ci_cpu = 'tlcpackstaging/ci_cpu:20220519-055908-ddfa1da69' ci_wasm = 'tlcpack/ci-wasm:20220513-055910-fa834f67e' ci_i386 = 'tlcpack/ci-i386:20220513-055910-fa834f67e' ci_qemu = 'tlcpack/ci-qemu:20220517-094028-de21c8f2e' From b636d50098003e8c0b7e33d12af645b9884926a7 Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Thu, 19 May 2022 17:52:07 +0900 Subject: [PATCH 2/3] [CI] Update CPU and GPU image --- Jenkinsfile | 6 +++--- jenkins/Jenkinsfile.j2 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d037ef1b0e08..52ef77bbecb6 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,13 +45,13 @@ // '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-19T15:44:16.656191 +// Generated at 2022-05-19T17:51:44.226223 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> ci_lint = 'tlcpack/ci-lint:20220513-055910-fa834f67e' -ci_gpu = 'tlcpackstaging/ci_gpu:20220519-055908-ddfa1da69' -ci_cpu = 'tlcpackstaging/ci_cpu:20220519-055908-ddfa1da69' +ci_gpu = 'tlcpack/ci-gpu:20220519-055908-ddfa1da69' +ci_cpu = 'tlcpack/ci-cpu:20220519-055908-ddfa1da69' ci_wasm = 'tlcpack/ci-wasm:20220513-055910-fa834f67e' ci_i386 = 'tlcpack/ci-i386:20220513-055910-fa834f67e' ci_qemu = 'tlcpack/ci-qemu:20220517-094028-de21c8f2e' diff --git a/jenkins/Jenkinsfile.j2 b/jenkins/Jenkinsfile.j2 index 397195cae0c3..b00ee0272626 100644 --- a/jenkins/Jenkinsfile.j2 +++ b/jenkins/Jenkinsfile.j2 @@ -52,8 +52,8 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> ci_lint = 'tlcpack/ci-lint:20220513-055910-fa834f67e' -ci_gpu = 'tlcpackstaging/ci_gpu:20220519-055908-ddfa1da69' -ci_cpu = 'tlcpackstaging/ci_cpu:20220519-055908-ddfa1da69' +ci_gpu = 'tlcpack/ci-gpu:20220519-055908-ddfa1da69' +ci_cpu = 'tlcpack/ci-cpu:20220519-055908-ddfa1da69' ci_wasm = 'tlcpack/ci-wasm:20220513-055910-fa834f67e' ci_i386 = 'tlcpack/ci-i386:20220513-055910-fa834f67e' ci_qemu = 'tlcpack/ci-qemu:20220517-094028-de21c8f2e' From 8fd5dead735e293b6cffc0f271a8992c49f9ef5c Mon Sep 17 00:00:00 2001 From: Masahiro Masuda Date: Fri, 20 May 2022 18:06:16 +0900 Subject: [PATCH 3/3] regenerate Jenkinsfile to avoid conflict --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 52ef77bbecb6..7b8c8f890db1 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-19T17:51:44.226223 +// Generated at 2022-05-20T18:06:10.772162 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. -->