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

Release 2.4.1 for CSM 1.6 #361

Merged
merged 4 commits into from
Sep 19, 2024
Merged

Release 2.4.1 for CSM 1.6 #361

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
d968c6a
Merge pull request #352 from Cray-HPE/mergeback-master-release/2.4.0-…
dlaine-hpe Sep 9, 2024
dc21a1f
CASMCMS-9142: Fix Python-related build failures
mharding-hpe Sep 19, 2024
626bbae
Merge pull request #360 from Cray-HPE/build
mharding-hpe Sep 19, 2024
b7221b6
Update CHANGELOG.md
mharding-hpe Sep 19, 2024
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
11 changes: 10 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.4.1] - 2024-09-19

### Changed
- CASMCMS-9142: Install Python modules using `--user` to prevent build failures, and build inside Docker container

## [2.4.0] - 2024-09-09

### Dependencies
Expand Down Expand Up @@ -509,7 +514,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Change default reviewers to CMS-core-product-support

[Unreleased]: https://github.com/Cray-HPE/cray-product-catalog/compare/v2.3.1...HEAD
[Unreleased]: https://github.com/Cray-HPE/cray-product-catalog/compare/v2.4.1...HEAD

[2.4.1]: https://github.com/Cray-HPE/cray-product-catalog/compare/v2.4.0...v2.4.1

[2.4.0]: https://github.com/Cray-HPE/cray-product-catalog/compare/v2.3.1...v2.4.0

[2.3.1]: https://github.com/Cray-HPE/cray-product-catalog/compare/v2.3.0...v2.3.1

Expand Down
11 changes: 10 additions & 1 deletion Jenkinsfile.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* MIT License
*
* (C) Copyright 2021-2023 Hewlett Packard Enterprise Development LP
* (C) Copyright 2021-2024 Hewlett Packard Enterprise Development LP
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -27,6 +27,8 @@
@Library('cms-meta-tools') _
@Library('csm-shared-library') __

def pyImage = 'artifactory.algol60.net/csm-docker/stable/csm-docker-sle-python'

pipeline {
agent {
label "metal-gcp-builder"
Expand Down Expand Up @@ -104,6 +106,13 @@ pipeline {
}

stage('Python Package'){
agent {
docker {
args "-v /home/jenkins/.ssh:/home/jenkins/.ssh -v /home/jenkins/.netrc:/home/jenkins/.netrc"
reuseNode true
image "${pyImage}:3.10"
}
}
steps {
sh "make pymod_prepare"
sh "make pymod_build"
Expand Down
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# MIT License
#
# (C) Copyright 2021-2023 Hewlett Packard Enterprise Development LP
# (C) Copyright 2021-2024 Hewlett Packard Enterprise Development LP
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
Expand Down Expand Up @@ -60,17 +60,17 @@ chart_test:
docker run --rm -v ${PWD}/${CHART_PATH}:/apps ${HELM_UNITTEST_IMAGE} -3 ${NAME}

pymod_prepare:
pip3 install --upgrade pip setuptools wheel
pip3 install --upgrade --user pip setuptools wheel

pymod_build:
python3 setup.py sdist bdist_wheel

pymod_test:
pip3 install -r requirements.txt
pip3 install -r requirements-test.txt
pip3 install --user -r requirements.txt
pip3 install --user -r requirements-test.txt
mkdir -p pymod_test
python3 setup.py install --user
python3 -m unittest discover tests
pycodestyle --config=.pycodestyle cray_product_catalog tests
python3 -m pycodestyle --config=.pycodestyle cray_product_catalog tests
# Run pylint, but only fail the build if the code scores lower than 8.0
pylint --fail-under=8.0 --rcfile=.pylintrc cray_product_catalog tests
python3 -m pylint --fail-under=8.0 --rcfile=.pylintrc cray_product_catalog tests
Loading