Skip to content

Commit 6c99dc7

Browse files
palash-gandhiprakashsurya
authored andcommitted
DLPX-94085 LTS 24.04: update delphix-platform for Ubuntu 24.04 appliance
PR URL: https://www.github.com/delphix/delphix-platform/pull/527
1 parent 7fcc2e7 commit 6c99dc7

File tree

6 files changed

+32
-53
lines changed

6 files changed

+32
-53
lines changed

.github/workflows/main.yml

+9-13
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ on: [push, pull_request]
22

33
jobs:
44
check-packages:
5-
runs-on: ubuntu-latest
5+
runs-on: ubuntu-24.04
66
steps:
77
- uses: actions/checkout@v2
88
- run: docker build -t delphix-platform:latest docker
99
- run: ./scripts/docker-run.sh make packages
10+
1011
check-shellcheck:
1112
runs-on: ubuntu-latest
1213
steps:
@@ -17,31 +18,26 @@ jobs:
1718
steps:
1819
- uses: actions/checkout@v2
1920
- uses: delphix/actions/shfmt@master
21+
2022
check-pylint:
21-
runs-on: ubuntu-latest
23+
runs-on: ubuntu-24.04
2224
steps:
2325
- uses: actions/checkout@v2
24-
- uses: actions/setup-python@v1
25-
with:
26-
python-version: '3.8'
26+
- uses: actions/setup-python@v5
2727
- run: python3 -m pip install pylint
2828
- run: python3 -m pip install netifaces
2929
- run: pylint -d invalid-name,E0611 files/common/usr/bin/delphix-startup-screen
3030
check-yapf:
31-
runs-on: ubuntu-latest
31+
runs-on: ubuntu-24.04
3232
steps:
3333
- uses: actions/checkout@v2
34-
- uses: actions/setup-python@v1
35-
with:
36-
python-version: '3.8'
34+
- uses: actions/setup-python@v5
3735
- run: python3 -m pip install yapf
3836
- run: yapf --diff --style google files/common/usr/bin/delphix-startup-screen
3937
check-mypy:
40-
runs-on: ubuntu-latest
38+
runs-on: ubuntu-24.04
4139
steps:
4240
- uses: actions/checkout@v2
43-
- uses: actions/setup-python@v1
44-
with:
45-
python-version: '3.8'
41+
- uses: actions/setup-python@v5
4642
- run: python3 -m pip install mypy
4743
- run: mypy --ignore-missing-imports files/common/usr/bin/delphix-startup-screen

debian/postinst

+15-3
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,23 @@ configure)
5252
#
5353
systemctl disable nullmailer.service
5454

55+
systemctl unmask auditd.service
5556
systemctl enable auditd.service
56-
systemctl enable delphix.target
57-
systemctl enable delphix-platform.service
58-
systemctl enable delphix-rpool-upgrade.service
57+
58+
systemctl unmask systemd-networkd.service
5959
systemctl enable systemd-networkd.service
60+
61+
systemctl unmask iscsi-name-init.service
6062
systemctl enable iscsi-name-init.service
6163

64+
systemctl unmask delphix-platform.service
65+
systemctl unmask delphix-rpool-upgrade.service
66+
systemctl unmask delphix.target
67+
68+
systemctl enable delphix-platform.service
69+
systemctl enable delphix-rpool-upgrade.service
70+
systemctl enable delphix.target
71+
6272
if ! id -u postgres >/dev/null; then
6373
# When installing postgres, a postgres user is created unless it
6474
# already exists. To have a consistent UID accross installations
@@ -70,6 +80,8 @@ configure)
7080
# postgres UID. Note that we put this code here instead of the
7181
# delphix-platform service as we need it to be executed before
7282
# the postgres package gets installed.
83+
sed -i 's/^UID_MAX.*/UID_MAX 65437/g' /etc/login.defs
84+
sed -i 's/^GID_MAX.*/GID_MAX 65437/g' /etc/login.defs
7385
addgroup postgres --gid 65437
7486
adduser --home /var/lib/postgresql --no-create-home \
7587
--shell /bin/bash --ingroup postgres \

debian/rules

+6-25
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/make -f
22
#
3-
# Copyright 2018, 2024 Delphix
3+
# Copyright 2018, 2025 Delphix
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -72,19 +72,21 @@ DEPENDS += ansible, \
7272
net-tools, \
7373
netbase, \
7474
netplan.io, \
75-
ntp, \
76-
nullmailer, \
75+
ntpsec, \
76+
nullmailer, \
7777
open-iscsi, \
7878
openssh-server, \
7979
openssl, \
8080
passwd, \
8181
policykit-1, \
8282
procps, \
8383
python3, \
84+
python3-netifaces, \
8485
rng-tools, \
8586
rsyslog, \
8687
sudo, \
8788
systemd-container, \
89+
systemd-resolved, \
8890
tzdata, \
8991
udev,
9092

@@ -110,47 +112,27 @@ DEPENDS += $(DEPENDS.$(TARGET_PLATFORM))
110112
#
111113
DEPENDS += delphix-build-info,
112114

113-
#
114-
# The usrmerge package modifies the layout of directories under root (/) upon
115-
# installation, to ensure that a Delphix Engine upgraded to Ubuntu 20.04 has
116-
# the same directory layout as a Delphix Engine that initially came on
117-
# Ubuntu 20.04 (or later).
118-
#
119-
DEPENDS += usrmerge,
120-
121-
#
122-
# These packages help strengthen the security of the appliance by identifying
123-
# and preventing undesired behaviors.
124-
#
125-
DEPENDS += aide, \
126-
aide-common,
127-
128115
#
129116
# These packages are tools that are intended for human convenience. The
130117
# product should not rely on them programmatically. They may be updated
131118
# or replaced without regard for backward compatibility.
132119
#
133120
DEPENDS += aptitude, \
134-
awscli, \
135-
bcc-tools, \
121+
bcc, \
136122
bpftrace, \
137123
crash-python, \
138124
delphix-rust, \
139125
dnsutils, \
140126
drgn, \
141-
dstat, \
142-
emacs-nox, \
143127
ethtool, \
144128
gdb, \
145-
gdb-python, \
146129
htop, \
147130
iftop, \
148131
inotify-tools, \
149132
iotop, \
150133
jq, \
151134
kdump-tools, \
152135
ldap-utils, \
153-
libkdumpfile, \
154136
linux-tools-common, \
155137
lsof, \
156138
man-db, \
@@ -229,4 +211,3 @@ override_dh_auto_test:
229211
# testing via another mechanism, so running it during package
230212
# builds is unnecessary.
231213
#
232-

files/common/lib/modprobe.d/10-lockd.conf

-10
This file was deleted.

files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/handlers/main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
when: ansible_virtualization_type != "systemd-nspawn" and not ansible_is_chroot
2828

2929
- systemd:
30-
name: sshd
30+
name: ssh
3131
state: reloaded
3232
listen: "sshd config changed"
3333
when: ansible_virtualization_type != "systemd-nspawn" and not ansible_is_chroot

files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
regexp: '^{{ item.key }}='
350350
line: '{{ item.key }}="{{ item.value }}"'
351351
with_items:
352-
- { key: 'JAVA_HOME', value: '/usr/lib/jvm/adoptopenjdk-java8-jdk-amd64' }
352+
- { key: 'JAVA_HOME', value: '/usr/lib/jvm/java-8-openjdk-amd64' }
353353

354354
#
355355
# Configure the Azure agent. Only run this on Azure, since that is the

0 commit comments

Comments
 (0)