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.

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

[ci] workaround recent changes in ceph's CI built container images #1051

Merged
merged 3 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions cephfs/file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,8 @@ func TestFallocate(t *testing.T) {

// Allocate space - default case, mode == 0.
t.Run("modeIsZero", func(t *testing.T) {
if serverVersion == cephMain {
switch serverVersion {
case cephMain, cephSquid, cephReef, cephQuincy:
t.Skip("fallocate with mode 0 is unsupported: https://tracker.ceph.com/issues/68026")
}

Expand All @@ -531,7 +532,8 @@ func TestFallocate(t *testing.T) {

// Allocate space - size increases, data remains intact.
t.Run("increaseSize", func(t *testing.T) {
if serverVersion == cephMain {
switch serverVersion {
case cephMain, cephSquid, cephReef, cephQuincy:
t.Skip("fallocate with mode 0 is unsupported: https://tracker.ceph.com/issues/68026")
}

Expand Down
5 changes: 5 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ PKG_PREFIX=github.com/ceph/go-ceph
ALT_FS="@/tmp/ceph/altfs.txt"
GOFLAGS="-buildvcs=false ${GOFLAGS}"

# hack around a change to the ci container environment
if [ -z "${CEPH_VERSION}" ]; then
export CEPH_VERSION="${CEPH_REF}"
fi

# Default env vars that are not currently changed by this script
# but can be used to change the test behavior:
# GO_CEPH_TEST_MDS_NAME
Expand Down
2 changes: 2 additions & 0 deletions testing/containers/ceph/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ ARG GO_CEPH_VERSION
ENV GO_CEPH_VERSION=${GO_CEPH_VERSION:-$CEPH_VERSION}

RUN true \
&& if [ -z "${CEPH_VERSION}" ]; then CEPH_VERSION="${CEPH_REF}"; fi \
&& echo "Check: [ ${CEPH_VERSION} = ${GO_CEPH_VERSION} ]" \
&& [ "${CEPH_VERSION}" = "${GO_CEPH_VERSION}" ] \
&& (. /etc/os-release ; if [ "$ID" = centos -a "$VERSION" = 8 ]; then find /etc/yum.repos.d/ -name '*.repo' -exec sed -i -e 's|^mirrorlist=|#mirrorlist=|g' -e 's|^#baseurl=http://mirror.centos.org|baseurl=https://vault.centos.org|g' {} \; ; fi ) \
&& if [ ! -f /etc/yum.repos.d/ceph.repo ]; then yum reinstall -y "$(curl -fs "https://shaman.ceph.com/api/search/?project=ceph&distros=centos/9/x86_64&flavor=default&ref=${CEPH_REF}&sha1=${CEPH_SHA:-latest}" | jq -r .[0].url)/noarch/ceph-release-1-0.el9.noarch.rpm"; fi \
&& yum install -y \
git wget /usr/bin/curl make \
/usr/bin/cc /usr/bin/c++ gdb \
Expand Down
Loading