diff --git a/CHANGELOG.md b/CHANGELOG.md index ea4210dc..b357563f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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 diff --git a/Jenkinsfile.github b/Jenkinsfile.github index df5a6112..16e8dbf7 100644 --- a/Jenkinsfile.github +++ b/Jenkinsfile.github @@ -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"), @@ -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" @@ -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" diff --git a/Makefile b/Makefile index 7a4183c7..3b32f93a 100644 --- a/Makefile +++ b/Makefile @@ -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"), @@ -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 \ No newline at end of file + python3 -m pylint --fail-under=8.0 --rcfile=.pylintrc cray_product_catalog tests \ No newline at end of file