From 2b053e23ce51b0e41d898f1d7c2ebda402b78346 Mon Sep 17 00:00:00 2001
From: driazati <driazati@users.noreply.github.com>
Date: Fri, 17 Jun 2022 13:38:59 -0700
Subject: [PATCH] [ci][docker] Remove Docker image upload prefix

These should go to the same tag as in `tlcpack` so the only difference is the user

Part of #11768
---
 Jenkinsfile              | 18 +++++++++---------
 jenkins/Deploy.groovy.j2 |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8e284ee951c8..722aabd5f6f9 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-17T13:38:47.940292
 
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. -->
@@ -3396,14 +3396,14 @@ def deploy() {
               returnStdout: true,
             ).trim()
             def tag = "${date_Ymd_HMS}-${upstream_revision.substring(0, 8)}"
-            update_docker(ci_arm, "tlcpackstaging/test_ci_arm:${tag}")
-            update_docker(ci_cpu, "tlcpackstaging/test_ci_cpu:${tag}")
-            update_docker(ci_gpu, "tlcpackstaging/test_ci_gpu:${tag}")
-            update_docker(ci_hexagon, "tlcpackstaging/test_ci_hexagon:${tag}")
-            update_docker(ci_i386, "tlcpackstaging/test_ci_i386:${tag}")
-            update_docker(ci_lint, "tlcpackstaging/test_ci_lint:${tag}")
-            update_docker(ci_qemu, "tlcpackstaging/test_ci_qemu:${tag}")
-            update_docker(ci_wasm, "tlcpackstaging/test_ci_wasm:${tag}")
+            update_docker(ci_arm, "tlcpackstaging/ci_arm:${tag}")
+            update_docker(ci_cpu, "tlcpackstaging/ci_cpu:${tag}")
+            update_docker(ci_gpu, "tlcpackstaging/ci_gpu:${tag}")
+            update_docker(ci_hexagon, "tlcpackstaging/ci_hexagon:${tag}")
+            update_docker(ci_i386, "tlcpackstaging/ci_i386:${tag}")
+            update_docker(ci_lint, "tlcpackstaging/ci_lint:${tag}")
+            update_docker(ci_qemu, "tlcpackstaging/ci_qemu:${tag}")
+            update_docker(ci_wasm, "tlcpackstaging/ci_wasm:${tag}")
           } finally {
             sh(
               script: 'docker logout',
diff --git a/jenkins/Deploy.groovy.j2 b/jenkins/Deploy.groovy.j2
index 0c81f8f4724a..0249aaffc512 100644
--- a/jenkins/Deploy.groovy.j2
+++ b/jenkins/Deploy.groovy.j2
@@ -106,7 +106,7 @@ def deploy() {
             ).trim()
             def tag = "${date_Ymd_HMS}-${upstream_revision.substring(0, 8)}"
             {% for image in images %}
-            update_docker({{ image.name }}, "tlcpackstaging/test_{{ image.name }}:${tag}")
+            update_docker({{ image.name }}, "tlcpackstaging/{{ image.name }}:${tag}")
             {% endfor %}
           } finally {
             sh(