From: Zack Cerza Date: Tue, 11 Feb 2025 21:01:18 +0000 (-0700) Subject: ceph-dev-pipeline: Fix indentation X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78d772e4e50aa4694a678e9d5b9b673811bcbd7e;p=ceph-build.git ceph-dev-pipeline: Fix indentation Signed-off-by: Zack Cerza --- diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile index 753a655a..345738ed 100644 --- a/ceph-dev-pipeline/build/Jenkinsfile +++ b/ceph-dev-pipeline/build/Jenkinsfile @@ -65,63 +65,63 @@ pipeline { } } stages { - stage("node") { - steps { - script { - def node_shortname = env.NODE_NAME.split('\\+')[-1] - def node_url = new URI([env.JENKINS_URL, "computer", env.NODE_NAME].join("/")).normalize() - echo "DIST=${env.DIST} ARCH=${env.ARCH} FLAVOR=${env.FLAVOR}\n${node_shortname}\n${node_url}" - } - sh "cat /etc/os-release" + stage("node") { + steps { + script { + def node_shortname = env.NODE_NAME.split('\\+')[-1] + def node_url = new URI([env.JENKINS_URL, "computer", env.NODE_NAME].join("/")).normalize() + echo "DIST=${env.DIST} ARCH=${env.ARCH} FLAVOR=${env.FLAVOR}\n${node_shortname}\n${node_url}" } + sh "cat /etc/os-release" } - stage("checkout ceph-build") { - steps { - checkout scmGit( - branches: [[name: ceph_build_branch]], - userRemoteConfigs: [[url: ceph_build_repo]], - extensions: [ - [$class: 'CleanBeforeCheckout'] - ], - ) - } + } + stage("checkout ceph-build") { + steps { + checkout scmGit( + branches: [[name: ceph_build_branch]], + userRemoteConfigs: [[url: ceph_build_repo]], + extensions: [ + [$class: 'CleanBeforeCheckout'] + ], + ) } - stage("copy artifacts") { - steps { - script { - if ( env.CI_COMPILE == "true" ) { - env.ARTIFACT_FILTER = "dist/**" - } else { - env.ARTIFACT_FILTER = "dist/sha1,dist/version,dist/other_envvars,dist/ceph_*.orig.tar.gz" - } - } - copyArtifacts( - projectName: "ceph-dev-new-setup", - selector: specific(buildNumber: env.SETUP_BUILD_ID), - filter: env.ARTIFACT_FILTER, - ) - script { - def sha1_props = readProperties file: "${WORKSPACE}/dist/sha1" - env.SHA1 = sha1_props.SHA1 - println "SHA1=${env.SHA1}" - env.VERSION = readFile(file: "${WORKSPACE}/dist/version").trim() - def shaman_url = "https://shaman.ceph.com/builds/ceph/${env.BRANCH}/${env.SHA1}" - def build_description = """\ - BRANCH=${env.BRANCH}
- SHA1=${env.SHA1}
- VERSION=${env.VERSION}
- DISTROS=${env.DISTROS}
- ARCHS=${env.ARCHS}
- FLAVOR=${env.FLAVOR}
- SETUP_BUILD_ID=${env.SETUP_BUILD_ID}
- shaman builds for this branch+commit - """.stripIndent() - buildDescription build_description + } + stage("copy artifacts") { + steps { + script { + if ( env.CI_COMPILE == "true" ) { + env.ARTIFACT_FILTER = "dist/**" + } else { + env.ARTIFACT_FILTER = "dist/sha1,dist/version,dist/other_envvars,dist/ceph_*.orig.tar.gz" } - sh "sha256sum dist/*" - sh "cat dist/sha1 dist/version" } + copyArtifacts( + projectName: "ceph-dev-new-setup", + selector: specific(buildNumber: env.SETUP_BUILD_ID), + filter: env.ARTIFACT_FILTER, + ) + script { + def sha1_props = readProperties file: "${WORKSPACE}/dist/sha1" + env.SHA1 = sha1_props.SHA1 + println "SHA1=${env.SHA1}" + env.VERSION = readFile(file: "${WORKSPACE}/dist/version").trim() + def shaman_url = "https://shaman.ceph.com/builds/ceph/${env.BRANCH}/${env.SHA1}" + def build_description = """\ + BRANCH=${env.BRANCH}
+ SHA1=${env.SHA1}
+ VERSION=${env.VERSION}
+ DISTROS=${env.DISTROS}
+ ARCHS=${env.ARCHS}
+ FLAVOR=${env.FLAVOR}
+ SETUP_BUILD_ID=${env.SETUP_BUILD_ID}
+ shaman builds for this branch+commit + """.stripIndent() + buildDescription build_description + } + sh "sha256sum dist/*" + sh "cat dist/sha1 dist/version" } + } stage("build") { environment { CHACRACTL_KEY = credentials('chacractl-key')