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

Remove custom c9 __DOCKERFILE_INSTALL__; use generic version #2217

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Remove custom c9 __DOCKERFILE_INSTALL__; use generic version #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
95 changes: 0 additions & 95 deletions ceph-releases/ALL/centos/9/daemon-base/__DOCKERFILE_INSTALL__
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ yum install -y epel-release && \
yum install -y jq && \
bash -c ' \
if [ -n "__GANESHA_PACKAGES__" ]; then \
if [[ "${CEPH_VERSION}" == master || "${CEPH_VERSION}" == main ]]; then \
ARCH=$(arch); if [[ "${ARCH}" == "aarch64" ]]; then ARCH="arm64"; fi ; \
curl -s -L "https://shaman.ceph.com/api/repos/nfs-ganesha/V5.7/latest/centos/__ENV_[DISTRO_VERSION]__/flavors/ceph_main/repo?arch=${ARCH}" -o /etc/yum.repos.d/ganesha.repo ; \
elif [[ "${CEPH_VERSION}" == squid ]]; then \
if [[ "${CEPH_VERSION}" =~ master|main|reef|squid ]]; then \
echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \
echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \
echo "baseurl=https://buildlogs.centos.org/centos/\$releasever-stream/storage/\$basearch/nfsganesha-5/" >> /etc/yum.repos.d/ganesha.repo ; \
Expand Down Expand Up @@ -94,7 +91,7 @@ bash -c ' \
else \
RELEASE_VER=1 ;\
if [[ __ENV_[PRERELEASE]__ = true ]] ; then \
REPO_URL="https://__ENV_[PRERELEASE_USERNAME]__:__ENV_[PRERELEASE_PASSWORD][email protected]/prerelease/rpm-${CEPH_VERSION}/el__ENV_[DISTRO_VERSION]__/"; \
REPO_URL="https://__ENV_[PRERELEASE_USERNAME]__:__ENV_[PRERELEASE_PASSWORD][email protected]/prerelease/ceph/rpm-${CEPH_VERSION}/el__ENV_[DISTRO_VERSION]__/"; \
else \
REPO_URL="http://download.ceph.com/rpm-${CEPH_VERSION}/el__ENV_[DISTRO_VERSION]__/"; \
fi \
Expand All @@ -105,13 +102,16 @@ bash -c ' \
# ago in the ceph build
#
if [[ __ENV_[PRERELEASE]__ = true ]] ; then \
sed -i "s;http://download.ceph.com/;https://__ENV_[PRERELEASE_USERNAME]__:__ENV_[PRERELEASE_PASSWORD][email protected]/prerelease/;" /etc/yum.repos.d/ceph.repo ; \
sed -i "s;http://download.ceph.com/;https://__ENV_[PRERELEASE_USERNAME]__:__ENV_[PRERELEASE_PASSWORD][email protected]/prerelease/ceph/;" /etc/yum.repos.d/ceph.repo ; \
dnf clean expire-cache ; \
fi && \
if [[ __ENV_[DISTRO_VERSION]__ -eq 8 ]]; then \
yum install -y dnf-plugins-core ; \
yum copr enable -y tchaikov/python-scikit-learn ; \
yum copr enable -y tchaikov/python3-asyncssh ; \
yum copr enable -y ceph/grpc ; \
fi ' && \
yum install -y --setopt=install_weak_deps=False --enablerepo=powertools __CEPH_BASE_PACKAGES__
TOOLS_REPO=powertools ; \
yum install -y --setopt=install_weak_deps=False --enablerepo=powertools __CEPH_BASE_PACKAGES__ ; \
else \
yum install -y --setopt=install_weak_deps=False --enablerepo=crb __CEPH_BASE_PACKAGES__ ; \
fi'
3 changes: 2 additions & 1 deletion contrib/ceph-build-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ function get_ceph_download_url () {
error "get_ceph_download_url - unknown distro '${distro}''"
esac
if [ "$PRERELEASE" = true ] ; then
echo "https://$PRERELEASE_USERNAME:[email protected]/prerelease/${flavor_path}/${arch}/"
echo "https://$PRERELEASE_USERNAME:[email protected]/prerelease/ceph/${flavor_path}/${arch}/"
else
echo "https://download.ceph.com/${flavor_path}/${arch}/"
fi
Expand Down Expand Up @@ -376,6 +376,7 @@ function get_latest_full_semver_tag () {
# For searching full versions, always use 'v<major>.<minor>.<bug>-' including the dash so that a
# search for 'v1.1.1' doesn't return 'v1.1.11' for example
if [ -n "${TEST_RUN:-}" ]; then
# date %Y%m%d
local build_num ; build_num="$(generate_new_build_number)"
build_num=$((build_num - 1))
if [[ $repository =~ .*amd64.* ]]; then
Expand Down
Loading