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.

Sign up for GitHub

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

Jump to bottom

[chore] master -> develop from PR Cray-HPE/cfs-state-reporter#44 (CASMCMS-8691) #45

Merged
merged 4 commits into from
Aug 10, 2023
Merged

[chore] master -> develop from PR Cray-HPE/cfs-state-reporter#44 (CASMCMS-8691) #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf46018
CASMCMS-8691: Build single noos RPM instead of one per SLE SP
mharding-hpe Aug 10, 2023
faa9410
Update Jenkinsfile to reduce chances of hung or failed builds
mharding-hpe Aug 10, 2023
517e286
Merge pull request #44 from Cray-HPE/CASMCMS-8691
mharding-hpe Aug 10, 2023
c156800
Merge branch 'develop' into mergeback-master-CASMCMS-8691-1691698679
mharding-hpe Aug 10, 2023
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added rotating file handler to capture output for when syslog fails
- Set connect and read timeout values for all connection objects using sessions

## [1.9.4] - 2023-08-10
### Changed
- RPM OS type changed to `noos`. (CASMCMS-8691)
- Disabled concurrent Jenkins builds on same branch/commit
- Added build timeout to avoid hung builds

## [1.9.3] - 2023-06-22
### Added
- Support for SLES SP5
Expand Down
91 changes: 9 additions & 82 deletions Jenkinsfile.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ pipeline {

options {
buildDiscarder(logRotator(numToKeepStr: "10"))
disableConcurrentBuilds()
timeout(time: 90, unit: 'MINUTES')
timestamps()
}

Expand All @@ -41,10 +43,6 @@ pipeline {
DESCRIPTION = "Cray Management System - Configuration Framework Operator"
IS_STABLE = getBuildIsStable()
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 All @@ -64,9 +62,9 @@ pipeline {

stage("runBuildPrep") {
steps {
withCredentials([usernamePassword(credentialsId: 'artifactory-algol60-readonly', passwordVariable: 'ARTIFACTORY_PASSWORD', usernameVariable: 'ARTIFACTORY_USERNAME')]) {
withCredentials([usernamePassword(credentialsId: 'artifactory-algol60-readonly', passwordVariable: 'ARTIFACTORY_PASSWORD', usernameVariable: 'ARTIFACTORY_USERNAME')]) {
sh "make runbuildprep"
}
}
}
}

Expand All @@ -89,94 +87,23 @@ pipeline {
}
}

stage("Build SP2") {
agent {
docker {
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 rpm"
}
}

stage('Publish SP2') {
steps {
script {
publishCsmRpms(component: env.NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", os: env.PUBLISH_SP2, arch: "noarch", isStable: env.IS_STABLE)
publishCsmRpms(component: env.NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", os: env.PUBLISH_SP2, arch: "src", isStable: env.IS_STABLE)
}
}
}

stage("Build SP3") {
agent {
docker {
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 rpm"
}
}

stage('Publish SP3') {
steps {
script {
publishCsmRpms(component: env.NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", os: env.PUBLISH_SP3, arch: "noarch", isStable: env.IS_STABLE)
publishCsmRpms(component: env.NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", os: env.PUBLISH_SP3, arch: "src", isStable: env.IS_STABLE)
}
}
}

stage("Build SP4") {
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 rpm"
}
}

stage('Publish SP4') {
steps {
script {
publishCsmRpms(component: env.NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", os: env.PUBLISH_SP4, arch: "noarch", isStable: env.IS_STABLE)
publishCsmRpms(component: env.NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", os: env.PUBLISH_SP4, arch: "src", isStable: env.IS_STABLE)
}
}
}

stage("Build SP5") {
stage("Build RPM") {
agent {
docker {
image "arti.hpc.amslabs.hpecorp.net/dstbuildenv-docker-master-local/cray-sle15sp5_build_environment:latest"
image "artifactory.algol60.net/csm-docker/stable/csm-docker-sle-python:3.6"
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 rpm"
}
}

stage('Publish SP5') {
stage('Publish RPM') {
steps {
script {
publishCsmRpms(component: env.NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", os: env.PUBLISH_SP5, arch: "noarch", isStable: env.IS_STABLE)
publishCsmRpms(component: env.NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", os: env.PUBLISH_SP5, arch: "src", isStable: env.IS_STABLE)
publishCsmRpms(component: env.NAME, pattern: "dist/rpmbuild/RPMS/noarch/*.rpm", os: "noos", arch: "noarch", isStable: env.IS_STABLE)
publishCsmRpms(component: env.NAME, pattern: "dist/rpmbuild/SRPMS/*.rpm", os: "noos", arch: "src", isStable: env.IS_STABLE)
}
}
}
Expand Down