Skip to content

Commit 06f37c2

Browse files
DLPX-92876 delphix-platform dependencies need to be updated to allow installation on 24.04 (#502)
PR URL: https://www.github.com/delphix/delphix-platform/pull/502
1 parent 8aa7466 commit 06f37c2

File tree

4 files changed

+16
-28
lines changed
  • .github/workflows
  • debian
  • files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks

4 files changed

+16
-28
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

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ configure)
7070
# postgres UID. Note that we put this code here instead of the
7171
# delphix-platform service as we need it to be executed before
7272
# the postgres package gets installed.
73+
sed -i 's/^UID_MAX.*/UID_MAX 65437/g' /etc/login.defs
74+
sed -i 's/^GID_MAX.*/GID_MAX 65437/g' /etc/login.defs
7375
addgroup postgres --gid 65437
7476
adduser --home /var/lib/postgresql --no-create-home \
7577
--shell /bin/bash --ingroup postgres \

debian/rules

+4-14
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ DEPENDS += ansible, \
8585
rsyslog, \
8686
sudo, \
8787
systemd-container, \
88+
systemd-resolved, \
8889
tzdata, \
8990
udev,
9091

@@ -110,14 +111,6 @@ DEPENDS += $(DEPENDS.$(TARGET_PLATFORM))
110111
#
111112
DEPENDS += delphix-build-info,
112113

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-
121114
#
122115
# These packages help strengthen the security of the appliance by identifying
123116
# and preventing undesired behaviors.
@@ -131,26 +124,24 @@ DEPENDS += aide, \
131124
# or replaced without regard for backward compatibility.
132125
#
133126
DEPENDS += aptitude, \
134-
awscli, \
135-
bcc-tools, \
127+
bcc, \
136128
bpftrace, \
137129
crash-python, \
138130
delphix-rust, \
139131
dnsutils, \
140-
drgn, \
132+
python3-drgn, \
141133
dstat, \
142134
emacs-nox, \
143135
ethtool, \
144136
gdb, \
145-
gdb-python, \
146137
htop, \
147138
iftop, \
148139
inotify-tools, \
149140
iotop, \
150141
jq, \
151142
kdump-tools, \
152143
ldap-utils, \
153-
libkdumpfile, \
144+
libkdumpfile10, \
154145
linux-tools-common, \
155146
lsof, \
156147
man-db, \
@@ -229,4 +220,3 @@ override_dh_auto_test:
229220
# testing via another mechanism, so running it during package
230221
# builds is unnecessary.
231222
#
232-

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)