From 6219292745f274a25de47dc00b41acea9af8525a Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 17:14:15 -0500 Subject: [PATCH 1/3] fix: Jenkinsfile had old credentials id autobuild, change to current jenkins-github id --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 43dbd29d4..3cedba6d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -98,7 +98,7 @@ pipeline { sh "curl -O https://gitlab.com/Northern.tech/OpenSource/GODS/-/raw/master/parallel_git_rev_fetch.sh" sh "chmod u+x ./parallel_git_rev_fetch.sh" - withCredentials([sshUserPrivateKey(credentialsId:"autobuild", keyFileVariable: "key")]) { + withCredentials([sshUserPrivateKey(credentialsId:"jenkins-github", keyFileVariable: "key")]) { sh 'export GIT_SSH_COMMAND="ssh -i $key"; ./parallel_git_rev_fetch.sh revisions' } } From 13836ec03a013d741495dfd3ddc4c99e9f970297 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 2 Jun 2026 14:15:46 -0500 Subject: [PATCH 2/3] fix: adjust Jenkinsfile ssh publisher config name to buildcache.cfengine.com Ticket: none Changelog: none (cherry picked from commit 38f708b8b05b952d718da45ec93ef77d5391c67b) --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3cedba6d5..e161c6f72 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,9 +16,9 @@ pipeline { string(name: "MASTERFILES_REV", defaultValue: '', description: 'used to document masterfiles. Use NUMBER or "pull/NUMBER/merge" for pull request (it\'s merged version, THIS DOESN\'T MERGE THE PR) or "pull/NUMBER/head" to build the docs with the non-merged code. Special syntax \'tag:SOME_TAG\' can be used to use a tag as a revision.') string(name: "DOCS_REV", defaultValue: '', description: 'Use NUMBER or "pull/NUMBER/merge" for pull request (it\'s merged version, THIS DOESN\'T MERGE THE PR) or "pull/NUMBER/head" to build the docs with the non-merged code. Special syntax \'tag:SOME_TAG\' can be used to use a tag as a revision.') string(name: "NT_DOCS_REV", defaultValue: '', description: 'Use NUMBER or "pull/NUMBER/merge" for pull request (it\'s merged version, THIS DOESN\'T MERGE THE PR) or "pull/NUMBER/head" to build the docs with the non-merged code. Special syntax \'tag:SOME_TAG\' can be used to use a tag as a revision.') - string(name: "DOCS_BRANCH", defaultValue: '', description: 'Where to upload artifacts - to http://buildcache.cloud.cfengine.com/packages/build-documentation-$DOCS_BRANCH/ and https://docs.cfengine.com/docs/$DOCS_BRANCH/') - string(name: "PACKAGE_JOB", defaultValue: 'cf-remote', description: 'where to get CFEngine HUB package from, either a dir at http://buildcache.cloud.cfengine.com/packages like testing-pr or a keyword cf-remote to use cf-remote download') - string(name: "USE_NIGHTLIES_FOR", defaultValue: '', description: 'branch whose nightlies to use (master, 3.18.x, etc) - will be one of http://buildcache.cloud.cfengine.com/packages/testing-pr/jenkins-$USE_NIGHTLIES_FOR-nightly-pipeline-$NUMBER/') + string(name: "DOCS_BRANCH", defaultValue: '', description: 'Where to upload artifacts - to http://buildcache.cfengine.com/packages/build-documentation-$DOCS_BRANCH/ and https://docs.cfengine.com/docs/$DOCS_BRANCH/') + string(name: "PACKAGE_JOB", defaultValue: 'cf-remote', description: 'where to get CFEngine HUB package from, either a dir at http://buildcache.cfengine.com/packages like testing-pr or a keyword cf-remote to use cf-remote download') + string(name: "USE_NIGHTLIES_FOR", defaultValue: '', description: 'branch whose nightlies to use (master, 3.18.x, etc) - will be one of http://buildcache.cfengine.com/packages/testing-pr/jenkins-$USE_NIGHTLIES_FOR-nightly-pipeline-$NUMBER/') string(name: "LTS_BASED_ON_VERSION", defaultValue: '', description: 'The actual CFEngine version that LTS is based on. This version will be used in code blocks or other places using the cfengine.branch variable.') } triggers { @@ -121,11 +121,11 @@ pipeline { } steps { sshPublisher( - // we must use alwaysPublishFromMaster: true because our CONTAINERS build hosts are not in the private network which has access to buildcache.cloud.cfengine.com + // we must use alwaysPublishFromMaster: true because our CONTAINERS build hosts are not in the private network which has access to buildcache.cfengine.com alwaysPublishFromMaster: true, publishers: [ sshPublisherDesc( - configName: 'buildcache.cloud.cfengine.com', + configName: 'buildcache.cfengine.com', transfers: [ sshTransfer( cleanRemote: false, From 16b5b8db9ca5a4a39e8601fc0d903a5474b54083 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 2 Jun 2026 14:43:22 -0500 Subject: [PATCH 3/3] fix: adjust Jenkinsfile so it only builds master branch on the nightly trigger instead of all branches including pull requests as it does now. --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e161c6f72..dc04e309c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,6 +31,10 @@ pipeline { stages { stage('Trigger Nightly Builds') { when { + allOf { + triggeredBy 'TimerTrigger' + branch 'master' + } triggeredBy 'TimerTrigger' } steps {