LM
/
nwl-ci
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jobs/buildAll,buildTarget: suppressed shell commands on job console 

to have a better overview some shell commands of basic parts are
suppressed with set +x

Signed-off-by: Marc Mattmüller <marc.mattmueller@netmodule.com>
This commit is contained in:
Marc Mattmüller 2023-08-01 10:58:03 +02:00
parent 9d7597ea4b
commit 8f6ae85d9e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jobs/Jenkinsfile_BuildAll
View File

@ -9,13 +9,13 @@ def common
// the files. In the current case we use any agent.
node() {
def repoPreCloneDir = "repo-preclone"
def nodeHostname = sh(returnStdout: true, script: "hostname | cut -d '_' -f1").trim()
def nodeHostname = sh(returnStdout: true, script: "set +x && hostname | cut -d '_' -f1").trim()
def cloneCredentials = ("${nodeHostname}" == "nwl") ? 'admin_credentials' : 'gitCredentials'
dir(repoPreCloneDir) {
// clone the repository to get the file with the target list
sshagent (credentials: [cloneCredentials]) {
sh "git clone --depth 1 --branch main ssh://git@bitbucket.gad.local:7999/nm-nsp/nwl-ci.git ."
sh "set +x && git clone --depth 1 --branch main ssh://git@bitbucket.gad.local:7999/nm-nsp/nwl-ci.git ."
}
// load common file
@ -121,7 +121,7 @@ def setupEnvironment(commonHelpers) {
//-----------------------------------------------------------------------------
def getTargetsFromList() {
def theTargets = sh(returnStdout: true, script: "cat ./jobs/nwlTargets | grep -v select").trim().split("\n")
def theTargets = sh(returnStdout: true, script: "set +x && cat ./jobs/nwlTargets | grep -v select").trim().split("\n")
return theTargets
}
//-----------------------------------------------------------------------------

6
jobs/Jenkinsfile_BuildTarget
View File

@ -12,17 +12,17 @@ def targetList
// the files. In the current case we use any agent.
node() {
def repoPreCloneDir = "repo-preclone"
def nodeHostname = sh(returnStdout: true, script: "hostname | cut -d '_' -f1").trim()
def nodeHostname = sh(returnStdout: true, script: "set +x && hostname | cut -d '_' -f1").trim()
def cloneCredentials = ("${nodeHostname}" == "nwl") ? 'admin_credentials' : 'gitCredentials'
dir(repoPreCloneDir) {
// clone the repository to get the file with the target list
sshagent (credentials: [cloneCredentials]) {
sh "git clone --depth 1 --branch main ssh://git@bitbucket.gad.local:7999/nm-nsp/nwl-ci.git ."
sh "set +x && git clone --depth 1 --branch main ssh://git@bitbucket.gad.local:7999/nm-nsp/nwl-ci.git ."
}
// get the list of the targets:
targetList = sh(returnStdout: true, script: "cat ./jobs/nwlTargets").trim()
targetList = sh(returnStdout: true, script: "set +x && cat ./jobs/nwlTargets").trim()
// load common file
common = load "./jobs/Jenkinsfile_Common"