From 4873128dd3e16bc8a0dfc5f22886d6eacba286ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Fri, 12 Jul 2024 10:50:27 +0200 Subject: [PATCH 1/3] chore: separate updatecli to its own pipeline --- Jenkinsfile_k8s | 4 ++-- Jenkinsfile_updatecli | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Jenkinsfile_updatecli diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s index b85f3ca..f78c419 100644 --- a/Jenkinsfile_k8s +++ b/Jenkinsfile_k8s @@ -10,7 +10,7 @@ parallel( } } }, - 'docker-and-updatecli': { - parallelDockerUpdatecli([imageName: 'openvpn']) + 'Build and publish docker image': { + buildDockerAndPublishImage('openvpn') }, ) diff --git a/Jenkinsfile_updatecli b/Jenkinsfile_updatecli new file mode 100644 index 0000000..f31c78a --- /dev/null +++ b/Jenkinsfile_updatecli @@ -0,0 +1,4 @@ +updatecli(action: 'diff') +if (env.BRANCH_IS_PRIMARY) { + updatecli(action: 'apply', cronTriggerExpression: '@daily') +} From 2f9de2369085dc89bdee78863869917fd6935325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Fri, 12 Jul 2024 13:37:49 +0200 Subject: [PATCH 2/3] use https://github.com/apps/jenkins-infra-updatecli for updatecli values --- updatecli/values.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/updatecli/values.yaml b/updatecli/values.yaml index 06c39bc..79b3d4c 100644 --- a/updatecli/values.yaml +++ b/updatecli/values.yaml @@ -1,6 +1,7 @@ +--- github: - user: "Jenkins Infra Bot (updatecli)" - email: "60776566+jenkins-infra-bot@users.noreply.github.com" + user: "jenkins-infra-updatecli" + email: "178728+jenkins-infra-updatecli[bot]@users.noreply.github.com" token: "UPDATECLI_GITHUB_TOKEN" branch: "main" owner: "jenkins-infra" From addd9ea78cf27445ecb263f00db09c657018b0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <91831478+lemeurherve@users.noreply.github.com> Date: Fri, 12 Jul 2024 16:15:29 +0200 Subject: [PATCH 3/3] weekly cron --- Jenkinsfile_updatecli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_updatecli b/Jenkinsfile_updatecli index f31c78a..b02dbaa 100644 --- a/Jenkinsfile_updatecli +++ b/Jenkinsfile_updatecli @@ -1,4 +1,4 @@ updatecli(action: 'diff') if (env.BRANCH_IS_PRIMARY) { - updatecli(action: 'apply', cronTriggerExpression: '@daily') + updatecli(action: 'apply', cronTriggerExpression: '@weekly') }