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

deb: add Ubuntu 24.04 (Noble Numbat) #639

Merged
merged 2 commits into from
Jun 25, 2024
Merged

deb: add Ubuntu 24.04 (Noble Numbat) #639

merged 2 commits into from
Jun 25, 2024

Conversation

kenhys
Copy link
Contributor

@kenhys kenhys commented Mar 27, 2024

No description provided.

@kenhys kenhys added this to the 5.0.4 (T.B.D.) milestone Mar 27, 2024
@kenhys kenhys force-pushed the noble branch 2 times, most recently from 1fc183a to f0562c7 Compare April 2, 2024 01:24
@kenhys
Copy link
Contributor Author

kenhys commented Apr 4, 2024

NOTE:

16.52 
16.52 The following packages have unmet dependencies:
16.58  cmake : Depends: cmake-data (= 3.28.3-1build5) but it is not going to be installed
16.59 E: Unable to correct problems, you have held broken packages.

arm64v8/ubuntu:noble cause an error.
I'll take a look it later.

@kenhys
Copy link
Contributor Author

kenhys commented Apr 8, 2024

arm64v8/ubuntu:noble cause an error.

It seems that this issue was resolved.

@kenhys kenhys force-pushed the noble branch 4 times, most recently from c262211 to f4a270c Compare April 10, 2024 04:22
@kenhys
Copy link
Contributor Author

kenhys commented May 31, 2024

memo: missing ubuntu:24.04 lxc image was blocker before, check it again.

@kenhys
Copy link
Contributor Author

kenhys commented May 31, 2024

It is strange that some container images were not found...

@kenhys
Copy link
Contributor Author

kenhys commented May 31, 2024

still ubuntu:24.04 image is not published yet.

@kenhys
Copy link
Contributor Author

kenhys commented May 31, 2024

It is very weird, the container images for CentOS/7, AmazonLinux 2 and AmazonLinux 2023 - CGroup V1 platform
were not available.

Thus, from ubuntu-20.04 host, these container can't be launched.

Here is the log on ubuntu-20.04 host:

lxc image list images:
Run test: list images
  To start your first container, try: lxc launch ubuntu:20.04
  Or for a virtual machine: lxc launch ubuntu:20.04 --vm
  
  +-------+-------------+--------+-------------+--------------+------+------+-------------+
  | ALIAS | FINGERPRINT | PUBLIC | DESCRIPTION | ARCHITECTURE | TYPE | SIZE | UPLOAD DATE |
  +-------+-------------+--------+-------------+--------------+------+------+-------------+
  + echo ::endgroup::

Empty image lists.

In contrast to ubuntu-20.04 host, centos/7 images are listed on ubuntu-latest (CGroup V2).
(centos/7 requires cgroup v1, but it was listed on it )

  +------------------------------------------+--------------+--------+-------------------------------------------+--------------+-----------------+------------+-------------------------------+
  | centos/7 (3 more)                        | a6930d4481f8 | yes    | CentOS 7 amd64 (20240531_0019)            | x86_64       | VIRTUAL-MACHINE | 405.45MiB  | May 31, 2024 at 12:00am (UTC) |
  +------------------------------------------+--------------+--------+-------------------------------------------+--------------+-----------------+------------+-------------------------------+
  | centos/7 (3 more)                        | f4c23689f2c8 | yes    | CentOS 7 amd64 (20240531_0019)            | x86_64       | CONTAINER       | 85.45MiB   | May 31, 2024 at 12:00am (UTC) |
  +------------------------------------------+--------------+--------+-------------------------------------------+--------------+-----------------+------------+-------------------------------+
  | centos/7/cloud (1 more)                  | 061551e59b88 | yes    | CentOS 7 amd64 (20240531_0019)            | x86_64       | CONTAINER       | 99.48MiB   | May 31, 2024 at 12:00am (UTC) |
  +------------------------------------------+--------------+--------+-------------------------------------------+--------------+-----------------+------------+-------------------------------+
  | centos/7/cloud (1 more)                  | d745955c6b5c | yes    | CentOS 7 amd64 (20240531_0019)            | x86_64       | VIRTUAL-MACHINE | 417.75MiB  | May 31, 2024 at 12:00am (UTC) |

lxc image info images:centos/7 on ubuntu-latest shows:

Fingerprint: f4c23689f2c89ca2c6d6088e7fb8c02b34fb3b39700d757e3844041562c3df25
  Size: 85.45MiB
  Architecture: x86_64
  Type: container
  Public: yes
  Timestamps:
      Created: 2024/05/31 00:00 UTC
      Uploaded: 2024/05/31 00:00 UTC
      Expires: never
      Last used: never
  Properties:
      architecture: amd64
      variant: default
      os: CentOS
      release: 7
      type: squashfs
      serial: 20240531_0019
      description: CentOS 7 amd64 (20240531_0019)
      requirements.cgroup: v1
  Aliases:
      - centos/7/default
      - centos/7/default/amd64
      - centos/7
      - centos/7/amd64
  Cached: no
  Auto update: disabled
  Profiles: []

It seems that ubuntu 20.04 host lxc images seems completely broken.

@kenhys
Copy link
Contributor Author

kenhys commented Jun 19, 2024

As #646 was resolved, rebased with master.

@kenhys kenhys marked this pull request as ready for review June 19, 2024 04:43
@kenhys kenhys requested a review from daipom June 20, 2024 01:59
daipom
daipom reviewed Jun 24, 2024
View reviewed changes
Copy link
Contributor

@daipom daipom left a comment

Choose a reason for hiding this comment

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

Thanks!
I have commented on some points.

Also, I have found some code that looks like we should add noble:

fluent-package-builder/fluent-lts-apt-source/convert-artifacts-layout.sh

Lines 18 to 38 in 275620d

for d in bullseye bookworm focal jammy; do
case $d in
bullseye|bookworm)
# e.g. mapping debian/pool/buster/main/t/td-agent/ => 5/debian/buster/pool/contrib/t/td-agent
# mapping debian/pool/buster/main/f/fluent-package/ => 5/debian/buster/pool/contrib/f/fluent-package
mkdir -p $ARTIFACTS_DIR/lts/5/debian/$d/pool/contrib/f/fluent-lts-apt-source
find $REPOSITORY_PATH/debian/pool/$d -name 'fluent*-apt-source*.deb' -not -name '*dbgsym*' \
-exec cp {} $ARTIFACTS_DIR/lts/5/debian/$d/pool/contrib/f/fluent-lts-apt-source \;
;;
focal|jammy)
# e.g. mapping ubuntu/pool/.../main/t/td-agent/ => 5/ubuntu/.../pool/contrib/t/td-agent
# mapping ubuntu/pool/.../main/f/fluent-package/ => 5/ubuntu/.../pool/contrib/f/fluent-package
mkdir -p $ARTIFACTS_DIR/lts/5/ubuntu/$d/pool/contrib/f/fluent-lts-apt-source
find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluent*-apt-source*.deb' \
-exec cp {} $ARTIFACTS_DIR/lts/5/ubuntu/$d/pool/contrib/f/fluent-lts-apt-source \;
;;
*)
exit 1
;;
esac
done

fluent-package-builder/fluent-package/test-install-in-docker.sh

Lines 85 to 104 in 275620d

CODENAME=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d'=' -f2)
case $CODENAME in
bullseye|bookworm|focal|jammy)
setup_apt_user
case $REPO in
exp/5)
curl -fsSL https://toolbelt.treasuredata.com/sh/install-$ID-$CODENAME-fluent-package5.sh | sh
sudo sed -i -e 's,/5,/test/experimental/5,' /etc/apt/sources.list.d/fluent.sources
;;
exp/lts/5)
curl -fsSL https://toolbelt.treasuredata.com/sh/install-$ID-$CODENAME-fluent-package5-lts.sh | sh
sudo sed -i -e 's,/lts/5,/test/experimental/lts/5,' /etc/apt/sources.list.d/fluent-lts.sources
;;
esac
sudo apt update
sudo apt upgrade -y
v=$(apt-cache show fluent-package | grep "^Version" | head -n 1 | cut -d':' -f 2)
check_installed_version $v
;;
esac

fluent-package-builder/fluent-package/test-verify-repo.sh

Lines 45 to 47 in 275620d

if [ -z "$DEB_TARGETS" ]; then
DEB_TARGETS="debian:bullseye debian:bookworm ubuntu:focal ubuntu:jammy"
fi

fluent-package/apt/pkgsize-test.sh Outdated Show resolved Hide resolved
fluent-package/convert-artifacts-layout.sh Outdated Show resolved Hide resolved
@kenhys
Copy link
Contributor Author

kenhys commented Jun 24, 2024

Fixed now.

daipom
daipom approved these changes Jun 25, 2024
View reviewed changes
Copy link
Contributor

@daipom daipom left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@kenhys kenhys merged commit 02db3f5 into fluent:master Jun 25, 2024
63 checks passed
@kenhys kenhys deleted the noble branch June 25, 2024 02:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daipom daipom daipom approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
5.0.4
Development

Successfully merging this pull request may close these issues.
2 participants
@kenhys @daipom