Merge branch 'main' into dduportal-patch-1

jenkins-infra · Aug 21, 2024 · dc69a3f · dc69a3f
2 parents 30d9cf3 + 3cd32c4
commit dc69a3f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git 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'])
+parallelDockerUpdatecli([
+  imageName: 'packaging',
+  rebuildImageOnPeriodicJob: false,
+  buildDockerConfig : [
+    useContainer: false,
+    targetplatforms: 'linux/amd64'
+  ]
+])
diff --git a/Jenkinsfile_updatecli b/Jenkinsfile_updatecli
diff --git 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: "[email protected]"
+  username: "jenkins-infra-bot"
   token: "UPDATECLI_GITHUB_TOKEN"
   branch: "main"
   owner: "jenkins-infra"