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

Build squid Microceph #345

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Build squid Microceph #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d31590
Build squid Microceph
UtkarshBhatthere Apr 29, 2024
e0e4272
Add setuptools dependency
wolsen May 9, 2024
224a724
Add liblmdb.so for rgw support
wolsen May 9, 2024
9d78fbe
Fix squid builds and CI failures.
UtkarshBhatthere Jun 6, 2024
03fdcb2
abbreviate pkg_version to 10 chars.
UtkarshBhatthere Jun 6, 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
30 changes: 30 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,11 @@ jobs:
output=$(sudo microceph log get-level)
if [[ "$output" != "3" ]] ; then echo "incorrect log level: $output"; exit 1; fi

- name: Print logs for failure
if: failure()
run: |
sudo snap logs microceph -n 1000

multi-node-tests:
name: Multi node testing
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -334,6 +339,11 @@ jobs:
- name: Test client configurations
run: ~/actionutils.sh check_client_configs

- name: Print logs for failure
if: failure()
run: |
sudo snap logs microceph -n 1000

multi-node-tests-with-custom-microceph-ip:
name: Multi node testing with custom microceph IP
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -386,6 +396,11 @@ jobs:
~/actionutils.sh headexec wait_for_osds 3
lxc exec node-wrk0 -- sh -c "microceph.ceph -s"

- name: Print logs for failure
if: failure()
run: |
sudo snap logs microceph -n 1000

loop-file-tests:
name: Test with loopback file OSDs
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -434,6 +449,11 @@ jobs:
~/actionutils.sh wait_for_osds 3
sudo microceph.ceph -s

- name: Print logs for failure
if: failure()
run: |
sudo snap logs microceph -n 1000

wal-db-tests:
name: Test WAL/DB device usage
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -495,6 +515,11 @@ jobs:
- name: Exercise RGW
run: ~/actionutils.sh testrgw

- name: Print logs for failure
if: failure()
run: |
sudo snap logs microceph -n 1000

upgrade-quincy-tests:
name: Test quincy upgrades
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -556,3 +581,8 @@ jobs:

- name: Exercise RGW again
run: ~/actionutils.sh headexec testrgw

- name: Print logs for failure
if: failure()
run: |
sudo snap logs microceph -n 1000
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, I wish we could reduce the duplication of those print log stanzas here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if we can abstract this step out given, The actual step is a one-liner (and rest is step description in each run.).

7 changes: 5 additions & 2 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ confinement: strict

package-repositories:
- type: apt
cloud: bobcat
cloud: caracal
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure we want to build for Squid by default before having a stable upstream release.
In any case we should cut a reef branch before switching master

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these are independent. As soon as we switch the reef track to a stable branch we can and should also build/publish the squid snap (without a stable risk level maybe).

priority: always

slots:
Expand Down Expand Up @@ -144,12 +144,13 @@ parts:
pkg_version=$(
dpkg-deb -f \
$CRAFT_PART_SRC/../stage_packages/ceph-common*.deb \
Version | sed -rne 's/([0-9.]+)[-+].*$$/\1/p')
Version | sed -rne 's/([0-9.]+)[-+].*$$/\1/p' | cut -c1-10)
git_version=$(
git -C $CRAFT_PROJECT_DIR describe \
--always \
--dirty \
--abbrev=10)
# changed as the original string was longer than 32chars.
craftctl set version=${pkg_version}+snap${git_version}
stage-packages:
- ceph-common
Expand All @@ -161,6 +162,7 @@ parts:
- radosgw
- coreutils
- uuid-runtime
- python3-setuptools
organize:
usr/bin/: bin/
usr/sbin/: bin/
Expand Down Expand Up @@ -225,6 +227,7 @@ parts:
- lib/*/rados-classes
- lib/*/libtcmalloc.so*
- lib/*/libunwind.so*
- lib/*/liblmdb.so*
- share/ceph

dqlite:
Expand Down
Loading