This is an automated email from the ASF dual-hosted git repository.
mousius pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/main by this push:
new 3745ccf161 [ci] Fix docs deploy (#13570)
3745ccf161 is described below
commit 3745ccf161a0e250d2d9f92c1e011ddb3e1b1640
Author: driazati <[email protected]>
AuthorDate: Wed Dec 7 02:36:16 2022 -0800
[ci] Fix docs deploy (#13570)
The PR #13300 had a bad merge with main an undid a fix from #13442, this
adds it back in.
---
.asf.yaml | 1 +
ci/jenkins/generated/docker_jenkinsfile.groovy | 238 +++++++++++-----------
ci/jenkins/generated/gpu_jenkinsfile.groovy | 9 +-
ci/jenkins/templates/docker_jenkinsfile.groovy.j2 | 42 ++--
ci/jenkins/templates/gpu_jenkinsfile.groovy.j2 | 5 +-
5 files changed, 153 insertions(+), 142 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 34d191e376..047a573e05 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -60,6 +60,7 @@ github:
- arm/pr-head
- cortexm/pr-head
- cpu/pr-head
+ - docker/pr-head
- gpu/pr-head
- hexagon/pr-head
- i386/pr-head
diff --git a/ci/jenkins/generated/docker_jenkinsfile.groovy
b/ci/jenkins/generated/docker_jenkinsfile.groovy
index 28e81efb7b..246b40c6e9 100644
--- a/ci/jenkins/generated/docker_jenkinsfile.groovy
+++ b/ci/jenkins/generated/docker_jenkinsfile.groovy
@@ -60,7 +60,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-12-05T14:48:41.987490
+// Generated at 2022-12-06T21:25:49.429894
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
ci_lint = 'tlcpack/ci-lint:20221013-060115-61c9742ea'
@@ -619,121 +619,6 @@ def update_docker(ecr_image, hub_image) {
)
}
-stage('Docker Image Build') {
- parallel(
- 'ci_arm': {
- node('ARM') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // ci_arm = build_image('ci_arm')
- built_ci_arm = build_image('ci_arm');
- }
- }
- },
- 'ci_cortexm': {
- node('CPU') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // ci_cortexm = build_image('ci_cortexm')
- built_ci_cortexm = build_image('ci_cortexm');
- }
- }
- },
- 'ci_cpu': {
- node('CPU') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // ci_cpu = build_image('ci_cpu')
- built_ci_cpu = build_image('ci_cpu');
- }
- }
- },
- 'ci_gpu': {
- node('GPU') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // ci_gpu = build_image('ci_gpu')
- built_ci_gpu = build_image('ci_gpu');
- }
- }
- },
- 'ci_hexagon': {
- node('CPU') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // ci_hexagon = build_image('ci_hexagon')
- built_ci_hexagon = build_image('ci_hexagon');
- }
- }
- },
- 'ci_i386': {
- node('CPU') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // ci_i386 = build_image('ci_i386')
- built_ci_i386 = build_image('ci_i386');
- }
- }
- },
- 'ci_lint': {
- node('CPU') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // ci_lint = build_image('ci_lint')
- built_ci_lint = build_image('ci_lint');
- }
- }
- },
- 'ci_minimal': {
- node('CPU') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // ci_minimal = build_image('ci_minimal')
- built_ci_minimal = build_image('ci_minimal');
- }
- }
- },
- 'ci_riscv': {
- node('CPU') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // ci_riscv = build_image('ci_riscv')
- built_ci_riscv = build_image('ci_riscv');
- }
- }
- },
- 'ci_wasm': {
- node('CPU') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // ci_wasm = build_image('ci_wasm')
- built_ci_wasm = build_image('ci_wasm');
- }
- }
- },
- )
-}
-
def deploy() {
stage('Deploy') {
if (env.BRANCH_NAME == 'main') {
@@ -957,4 +842,123 @@ def deploy() {
}
}
-deploy()
+
+
+if (rebuild_docker_images) {
+ stage('Docker Image Build') {
+ parallel(
+ 'ci_arm': {
+ node('ARM') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // ci_arm = build_image('ci_arm')
+ built_ci_arm = build_image('ci_arm');
+ }
+ }
+ },
+ 'ci_cortexm': {
+ node('CPU') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // ci_cortexm = build_image('ci_cortexm')
+ built_ci_cortexm = build_image('ci_cortexm');
+ }
+ }
+ },
+ 'ci_cpu': {
+ node('CPU') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // ci_cpu = build_image('ci_cpu')
+ built_ci_cpu = build_image('ci_cpu');
+ }
+ }
+ },
+ 'ci_gpu': {
+ node('GPU') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // ci_gpu = build_image('ci_gpu')
+ built_ci_gpu = build_image('ci_gpu');
+ }
+ }
+ },
+ 'ci_hexagon': {
+ node('CPU') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // ci_hexagon = build_image('ci_hexagon')
+ built_ci_hexagon = build_image('ci_hexagon');
+ }
+ }
+ },
+ 'ci_i386': {
+ node('CPU') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // ci_i386 = build_image('ci_i386')
+ built_ci_i386 = build_image('ci_i386');
+ }
+ }
+ },
+ 'ci_lint': {
+ node('CPU') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // ci_lint = build_image('ci_lint')
+ built_ci_lint = build_image('ci_lint');
+ }
+ }
+ },
+ 'ci_minimal': {
+ node('CPU') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // ci_minimal = build_image('ci_minimal')
+ built_ci_minimal = build_image('ci_minimal');
+ }
+ }
+ },
+ 'ci_riscv': {
+ node('CPU') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // ci_riscv = build_image('ci_riscv')
+ built_ci_riscv = build_image('ci_riscv');
+ }
+ }
+ },
+ 'ci_wasm': {
+ node('CPU') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // ci_wasm = build_image('ci_wasm')
+ built_ci_wasm = build_image('ci_wasm');
+ }
+ }
+ },
+ )
+ }
+
+ deploy()
+}
diff --git a/ci/jenkins/generated/gpu_jenkinsfile.groovy
b/ci/jenkins/generated/gpu_jenkinsfile.groovy
index c226255e0e..ef357f0d7c 100644
--- a/ci/jenkins/generated/gpu_jenkinsfile.groovy
+++ b/ci/jenkins/generated/gpu_jenkinsfile.groovy
@@ -60,7 +60,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-12-05T14:48:42.195581
+// Generated at 2022-12-06T20:30:23.035868
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
ci_lint = 'tlcpack/ci-lint:20221013-060115-61c9742ea'
@@ -1274,10 +1274,9 @@ def deploy() {
timeout(time: max_time, unit: 'MINUTES') {
init_git()
sh(
- script: "./${jenkins_scripts_root}/s3.py --action download
--bucket ${s3_bucket} --prefix ${s3_prefix}/docs",
- label: 'Download artifacts from S3',
- )
-
+ script: "./${jenkins_scripts_root}/s3.py --action
download --bucket ${s3_bucket} --prefix ${s3_prefix}/docs --items docs.tgz",
+ label: 'Download docs folder from S3',
+ )
deploy_docs()
}
}
diff --git a/ci/jenkins/templates/docker_jenkinsfile.groovy.j2
b/ci/jenkins/templates/docker_jenkinsfile.groovy.j2
index 016a1c7bc8..db3e6159b8 100644
--- a/ci/jenkins/templates/docker_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/docker_jenkinsfile.groovy.j2
@@ -138,24 +138,6 @@ def update_docker(ecr_image, hub_image) {
)
}
-stage('Docker Image Build') {
- parallel(
- {% for image in images %}
- '{{ image.name }}': {
- node('{{ image.platform }}') {
- timeout(time: max_time, unit: 'MINUTES') {
- init_git()
- // We're purposefully not setting the built image here since they
- // are not yet being uploaded to tlcpack
- // {{ image.name }} = build_image('{{ image.name }}')
- built_{{ image.name }} = build_image('{{ image.name }}');
- }
- }
- },
- {% endfor %}
- )
-}
-
def deploy() {
stage('Deploy') {
if (env.BRANCH_NAME == 'main') {
@@ -236,4 +218,26 @@ def deploy() {
}
}
-deploy()
+
+
+if (rebuild_docker_images) {
+ stage('Docker Image Build') {
+ parallel(
+ {% for image in images %}
+ '{{ image.name }}': {
+ node('{{ image.platform }}') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ init_git()
+ // We're purposefully not setting the built image here since they
+ // are not yet being uploaded to tlcpack
+ // {{ image.name }} = build_image('{{ image.name }}')
+ built_{{ image.name }} = build_image('{{ image.name }}');
+ }
+ }
+ },
+ {% endfor %}
+ )
+ }
+
+ deploy()
+}
diff --git a/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2
b/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2
index 4a11a1bc42..2a9e7236d2 100644
--- a/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2
+++ b/ci/jenkins/templates/gpu_jenkinsfile.groovy.j2
@@ -195,7 +195,10 @@ def deploy() {
ws="tvm/deploy-docs",
) %}
init_git()
- {{ m.download_artifacts(tag='docs') }}
+ sh(
+ script: "./${jenkins_scripts_root}/s3.py --action download
--bucket ${s3_bucket} --prefix ${s3_prefix}/docs --items docs.tgz",
+ label: 'Download docs folder from S3',
+ )
deploy_docs()
{% endcall %}
)
