Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.6.0 #202

Merged
merged 3 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## [2.6.0] - 08-09-2023
### Changed
- Build `bos-reporter` RPM as `noos`

## [2.5.6] - 08-08-2023
### Changed
- IsAlive attribute look-up.
Expand Down
135 changes: 28 additions & 107 deletions Jenkinsfile.github
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ pipeline {
IS_STABLE = getBuildIsStable()
DOCKER_BUILDKIT = "1"
BUILD_METADATA = getRpmRevision(isStable: env.IS_STABLE)
PUBLISH_SP2 = "sle-15sp2"
PUBLISH_SP3 = "sle-15sp3"
PUBLISH_SP4 = "sle-15sp4"
PUBLISH_SP5 = "sle-15sp5"
}

stages {
Expand Down Expand Up @@ -83,6 +79,11 @@ pipeline {
runLibraryScript("addRpmMetaData.sh", env.RPTR_SPEC_FILE)
}
}
stage("RPM Build Prepare") {
steps {
sh "make rpm_prepare"
}
}
stage("Build Image and Chart") {
parallel {
stage('Image') {
Expand All @@ -104,9 +105,22 @@ pipeline {
sh "make chart"
}
}
stage("RPM Build") {
agent {
docker {
image "arti.hpc.amslabs.hpecorp.net/dstbuildenv-docker-master-local/cray-sle15sp5_build_environment:latest"
reuseNode true
// Support docker in docker for clamav scan
args "-v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker --group-add 999"
}
}
steps {
sh "make rptr_rpm_prepare"
sh "make rptr_rpm"
}
}
}
}

stage('Publish ') {
parallel {
stage('Image and Chart') {
Expand All @@ -118,109 +132,16 @@ pipeline {
publishCsmHelmCharts(component: env.NAME, chartsPath: "${WORKSPACE}/kubernetes/.packaged", isStable: env.IS_STABLE)
}
}
}
}
stage("RPM Build Prepare") {
steps {
sh "make rpm_prepare"
}
}
stage("SLES15SP2 RPM Build") {
agent {
docker {
// https://rndwiki-pro.its.hpecorp.net/display/CSMTemp/Build+Environment+Docker+Images
image "arti.hpc.amslabs.hpecorp.net/dstbuildenv-docker-master-local/cray-sle15sp2_build_environment:latest"
reuseNode true
// Support docker in docker for clamav scan
args "-v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker --group-add 999"
}
}
steps {
sh "make rptr_rpm_prepare"
sh "make rptr_rpm"
}
}
stage("SLES15SP2 RPM Publish") {
steps {
script {
publishCsmRpms(component: env.REPORTER_NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", os: env.PUBLISH_SP2, arch: "noarch", isStable: env.IS_STABLE)
publishCsmRpms(component: env.REPORTER_NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", os: env.PUBLISH_SP2, arch: "src", isStable: env.IS_STABLE)
}
sh "make rpm_build_clean"
sh "make rpm_build_source_clean"
}
}
stage("SLES15SP3 RPM Build") {
agent {
docker {
// https://rndwiki-pro.its.hpecorp.net/display/CSMTemp/Build+Environment+Docker+Images
image "arti.hpc.amslabs.hpecorp.net/dstbuildenv-docker-master-local/cray-sle15sp3_build_environment:latest"
reuseNode true
// Support docker in docker for clamav scan
args "-v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker --group-add 999"
}
}
steps {
sh "make rptr_rpm_prepare"
sh "make rptr_rpm"
}
}
stage("SLES15SP3 RPM Publish") {
steps {
script {
publishCsmRpms(component: env.REPORTER_NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", os: env.PUBLISH_SP3, arch: "noarch", isStable: env.IS_STABLE)
publishCsmRpms(component: env.REPORTER_NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", os: env.PUBLISH_SP3, arch: "src", isStable: env.IS_STABLE)
}
sh "make rpm_build_clean"
sh "make rpm_build_source_clean"
}
}
stage("SLES15SP4 RPM Build") {
agent {
docker {
image "arti.hpc.amslabs.hpecorp.net/dstbuildenv-docker-master-local/cray-sle15sp4_build_environment:latest"
reuseNode true
// Support docker in docker for clamav scan
args "-v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker --group-add 999"
}
}
steps {
sh "make rptr_rpm_prepare"
sh "make rptr_rpm"
}
}
stage("SLES15SP4 RPM Publish") {
steps {
script {
publishCsmRpms(component: env.REPORTER_NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", os: env.PUBLISH_SP4, arch: "noarch", isStable: env.IS_STABLE)
publishCsmRpms(component: env.REPORTER_NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", os: env.PUBLISH_SP4, arch: "src", isStable: env.IS_STABLE)
}
sh "make rpm_build_clean"
sh "make rpm_build_source_clean"
}
}
stage("SLES15SP5 RPM Build") {
agent {
docker {
image "arti.hpc.amslabs.hpecorp.net/dstbuildenv-docker-master-local/cray-sle15sp5_build_environment:latest"
reuseNode true
// Support docker in docker for clamav scan
args "-v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker --group-add 999"
}
}
steps {
sh "make rptr_rpm_prepare"
sh "make rptr_rpm"
}
}
stage("SLES15SP5 RPM Publish") {
steps {
script {
publishCsmRpms(component: env.REPORTER_NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", os: env.PUBLISH_SP5, arch: "noarch", isStable: env.IS_STABLE)
publishCsmRpms(component: env.REPORTER_NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", os: env.PUBLISH_SP5, arch: "src", isStable: env.IS_STABLE)
stage("RPM Publish") {
steps {
script {
publishCsmRpms(component: env.REPORTER_NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", os: "noos", arch: "noarch", isStable: env.IS_STABLE)
publishCsmRpms(component: env.REPORTER_NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", os: "noos", arch: "src", isStable: env.IS_STABLE)
}
sh "make rpm_build_clean"
sh "make rpm_build_source_clean"
}
}
sh "make rpm_build_clean"
sh "make rpm_build_source_clean"
}
}
}
Expand Down