From 3cd32c4cab3157cd6ae167d14222c3f342a430ab Mon Sep 17 00:00:00 2001
From: Damien Duportal <damien.duportal@gmail.com>
Date: Wed, 21 Aug 2024 13:20:27 +0200
Subject: [PATCH] Revert "chore: separate updatecli to its own pipeline" (#139)

---
 Jenkinsfile_k8s       | 16 ++++++++--------
 Jenkinsfile_updatecli |  4 ----
 updatecli/values.yaml |  5 +++--
 3 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100644 Jenkinsfile_updatecli

diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s
index 7b25f90..a19bd05 100644
--- a/Jenkinsfile_k8s
+++ b/Jenkinsfile_k8s
@@ -1,8 +1,8 @@
-String cronTriggerExpression = ''
-if (env.BRANCH_IS_PRIMARY) {
-    cronTriggerExpression = '@weekly'
-}
-
-properties([pipelineTriggers([cron(cronTriggerExpression)])])
-
-buildDockerAndPublishImage('packaging', [targetplatforms: 'linux/amd64,linux/arm64'])
+parallelDockerUpdatecli([
+  imageName: 'packaging',
+  rebuildImageOnPeriodicJob: false,
+  buildDockerConfig : [
+    useContainer: false,
+    targetplatforms: 'linux/amd64,linux/arm64'
+  ]
+])
diff --git a/Jenkinsfile_updatecli b/Jenkinsfile_updatecli
deleted file mode 100644
index b02dbaa..0000000
--- a/Jenkinsfile_updatecli
+++ /dev/null
@@ -1,4 +0,0 @@
-updatecli(action: 'diff')
-if (env.BRANCH_IS_PRIMARY) {
-    updatecli(action: 'apply', cronTriggerExpression: '@weekly')
-}
diff --git a/updatecli/values.yaml b/updatecli/values.yaml
index f848d58..87db658 100644
--- a/updatecli/values.yaml
+++ b/updatecli/values.yaml
@@ -1,7 +1,8 @@
 ---
 github:
-  user: "jenkins-infra-updatecli"
-  email: "178728+jenkins-infra-updatecli[bot]@users.noreply.github.com"
+  user: "Jenkins Infra Bot (updatecli)"
+  email: "60776566+jenkins-infra-bot@users.noreply.github.com"
+  username: "jenkins-infra-bot"
   token: "UPDATECLI_GITHUB_TOKEN"
   branch: "main"
   owner: "jenkins-infra"