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 1.17.8 for CSM 1.6 #245

Merged
merged 4 commits into from
Feb 22, 2024
Merged

Release 1.17.8 for CSM 1.6 #245

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
d18f31a
Merge pull request #242 from Cray-HPE/mergeback-master-develop-170862…
mharding-hpe Feb 22, 2024
980fa42
Append auth=basic to artifactory zypper URLs
mharding-hpe Feb 22, 2024
e92d5d3
Merge pull request #244 from Cray-HPE/auth-basic
mharding-hpe Feb 22, 2024
e3460c1
Update CHANGELOG.md
mharding-hpe Feb 22, 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
10 changes: 9 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,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.17.8] - 2024-02-22

### Changed

- Append `?auth-basic` to SLES mirror zypper URLs to prevent artifactory from locking out the user during builds

## [1.17.7] - 2024-02-22

### Changed
Expand Down Expand Up @@ -397,7 +403,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Ansible playbook for applying csm packages to Compute and Application nodes

[Unreleased]: https://github.com/Cray-HPE/csm-config/compare/1.17.7...HEAD
[Unreleased]: https://github.com/Cray-HPE/csm-config/compare/1.17.8...HEAD

[1.17.8]: https://github.com/Cray-HPE/csm-config/compare/1.17.7...1.17.8

[1.17.7]: https://github.com/Cray-HPE/csm-config/compare/1.17.6...1.17.7

Expand Down
26 changes: 24 additions & 2 deletions zypper-docker-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,33 @@ CREDS=${ARTIFACTORY_USERNAME:-}
CSM_SLES_REPO_URL="https://${CREDS}@artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/sle-15sp${SP}?auth=basic"
CSM_NOOS_REPO_URL="https://${CREDS}@artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/noos?auth=basic"
SLES_MIRROR_URL="https://${CREDS}@artifactory.algol60.net/artifactory/sles-mirror"
SLES_PRODUCTS_URL="${SLES_MIRROR_URL}/Products"
SLES_UPDATES_URL="${SLES_MIRROR_URL}/Updates"

function add_zypper_repos {
local label
label=$1
zypper --non-interactive ar "${SLES_PRODUCTS_URL}/SLE-${label}/15-SP${SP}/${ARCH}/product/?auth=basic" "sles15sp${SP}-${label}-product"
zypper --non-interactive ar "${SLES_UPDATES_URL}/SLE-${label}/15-SP${SP}/${ARCH}/update/?auth=basic" "sles15sp${SP}-${label}-update"
}

if [[ ${SP} -eq 4 ]]; then
# The current sles15sp4 base image starts with a lock on coreutils, but this prevents a necessary
# security patch from being applied. Thus, adding this command to remove the lock if it is
# present.
zypper --non-interactive removelock coreutils || true
fi

zypper --non-interactive rr --all
zypper --non-interactive clean -a
zypper --non-interactive ar "${SLES_MIRROR_URL}/Products/SLE-Module-Basesystem/15-SP${SP}/${ARCH}/product/" "sles15sp${SP}-Module-Basesystem-product"
zypper --non-interactive ar "${SLES_MIRROR_URL}/Updates/SLE-Module-Basesystem/15-SP${SP}/${ARCH}/update/" "sles15sp${SP}-Module-Basesystem-update"
for MODULE in Basesystem Certifications Containers Desktop-Applications Development-Tools HPC Legacy Packagehub-Subpackages \
Public-Cloud Python3 Server-Applications Web-Scripting
do
add_zypper_repos "Module-${MODULE}"
done
for PRODUCT in HA HPC SLED SLES SLES_SAP WE; do
add_zypper_repos "Product-${PRODUCT}"
done
zypper --non-interactive ar --no-gpgcheck "${CSM_SLES_REPO_URL}" csm-sles
zypper --non-interactive ar --no-gpgcheck "${CSM_NOOS_REPO_URL}" csm-noos
zypper --non-interactive --gpg-auto-import-keys refresh
Expand Down
Loading