diff --git a/Jenkinsfile_Common b/Jenkinsfile_Common index a8ad9b9..2a57f1e 100644 --- a/Jenkinsfile_Common +++ b/Jenkinsfile_Common @@ -40,15 +40,17 @@ def isRelease(versionParam) { def handleSubmodules(versionParam) { - println "init submodules..." - sh 'git submodule update --init' - if(isRelease(versionParam)) { - println "set submodules to freezed state..." - sh 'git submodule update' // set all submodules to freezed commit - } - else { - println "setting netmodule submodule hashes to head..." - sh 'git submodule update --remote --rebase meta-netmodule-*' // update our own submodules to HEAD + sshagent (credentials: ['7767e711-08a4-4c71-b080-197253dd7392']) { + println "init submodules..." + sh 'git submodule update --init' + if(isRelease(versionParam)) { + println "set submodules to freezed state..." + sh 'git submodule update' // set all submodules to freezed commit + } + else { + println "setting netmodule submodule hashes to head..." + sh 'git submodule update --remote --rebase meta-netmodule-*' // update our own submodules to HEAD + } } submoduleStatus = sh(returnStdout: true, script: "git submodule status").trim() // print submodule hashes to jenkins log println "${submoduleStatus}" @@ -111,8 +113,10 @@ def buildVersionString(imageType, actualBaseVersionString, versionParameter) { } def getVersionString(versionParam, imageType) { - sh 'git fetch -ap' - sh 'git fetch -t' + sshagent (credentials: ['7767e711-08a4-4c71-b080-197253dd7392']) { + sh 'git fetch -ap' + sh 'git fetch -t' + } def gitCmd = "git describe --tags" if(!isRelease(versionParam)) { diff --git a/Jenkinsfile_update2head b/Jenkinsfile_update2head index 78d80ab..0a4fb70 100644 --- a/Jenkinsfile_update2head +++ b/Jenkinsfile_update2head @@ -75,8 +75,9 @@ def printJobParameters() { } def prepareUpdate() { - sh 'git submodule update --init' // init submodules used if first checkout - + sshagent (credentials: ['7767e711-08a4-4c71-b080-197253dd7392']) { + sh 'git submodule update --init' // init submodules used if first checkout + } def userId = "${currentBuild.getBuildCauses()[0].userId}" def userName = "${currentBuild.getBuildCauses()[0].userName}" if("${userId}" == "null") { @@ -93,11 +94,13 @@ def prepareUpdate() { } def updateSubmodules(isNmUpdate, isCommunityUpdate) { - if(isNmUpdate) { - sh(script: "git submodule update --remote --rebase meta-netmodule-*") - } - if(isCommunityUpdate) { - sh(script: "git submodule update --remote --rebase \$(git submodule status | grep -v \"meta-netmodule-*\" | sed 's/^ *//g' | cut -d' ' -f2)") + sshagent (credentials: ['7767e711-08a4-4c71-b080-197253dd7392']) { + if(isNmUpdate) { + sh(script: "git submodule update --remote --rebase meta-netmodule-*") + } + if(isCommunityUpdate) { + sh(script: "git submodule update --remote --rebase \$(git submodule status | grep -v \"meta-netmodule-*\" | sed 's/^ *//g' | cut -d' ' -f2)") + } } submoduleStatus = sh(returnStdout: true, script: "git submodule status").trim() // print submodule hashes to jenkins log println "${submoduleStatus}" @@ -128,7 +131,9 @@ def updateSourceRevisions(isNmUpdate) { def commitSourceRevisionChanges() { println "commit source revision changes..." - sh(returnStdout: true, script: "./src-rev-commit.sh -b develop -v -l ./srcrev-commit.log") + sshagent (credentials: ['7767e711-08a4-4c71-b080-197253dd7392']) { + sh(returnStdout: true, script: "./src-rev-commit.sh -b develop -v -l ./srcrev-commit.log") + } sh "cat ./srcrev-commit.log >> ./${env.SOURCE_REVISION_UPDATE_LOG}" } @@ -147,5 +152,7 @@ def commitChanges(isNmUpdate, isCommunityUpdate) { println "everything up to date, nothing to commit" return } - sh(script: "git commit -m \"submodules: updated ${updatedLayers} hashes, triggered by ${env.TRIGGERED_USER}\" && git push") + sshagent (credentials: ['7767e711-08a4-4c71-b080-197253dd7392']) { + sh(script: "git commit -m \"submodules: updated ${updatedLayers} hashes, triggered by ${env.TRIGGERED_USER}\" && git push") + } }