Skip to content

Commit 598af42

Browse files
authored
Move from deprecated ntpdate to ntpsec-ntpdate (infra) (#2134)
Fix packaging moving from deprecated ntpdate to ntpsec-ntpdate
1 parent d2ddde9 commit 598af42

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

providers/base/units/dock/jobs.pxu

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,8 @@ id: dock/networking-ntp
652652
category_id: dock-network
653653
plugin: user-interact-verify
654654
depends: dock/cold-plug
655-
requires: package.name == 'ntpdate'
655+
requires:
656+
(package.name == 'ntpdate' or package.name == 'ntpsec-ntpdate')
656657
user: root
657658
command: network_ntp_test.py
658659
estimated_duration: 10.00
@@ -2680,7 +2681,7 @@ plugin: user-interact-verify
26802681
imports: from com.canonical.plainbox import manifest
26812682
requires:
26822683
manifest.has_dock_ethernet_adapter == 'True'
2683-
package.name == 'ntpdate'
2684+
(package.name == 'ntpdate' or package.name == 'ntpsec-ntpdate')
26842685
user: root
26852686
command: network_ntp_test.py
26862687
estimated_duration: 10.00

providers/base/units/networking/jobs.pxu

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ plugin: shell
7070
category_id: com.canonical.plainbox::networking
7171
id: networking/ntp
7272
flags: also-after-suspend
73-
requires: package.name == 'ntpdate'
73+
requires:
74+
(package.name == 'ntpdate' or package.name == 'ntpsec-ntpdate')
7475
user: root
7576
command: network_ntp_test.py
7677
_purpose: Test to see if we can sync local clock to an NTP server
@@ -122,4 +123,4 @@ _steps:
122123
3. Disable the Airplane Mode in Wi-Fi settings
123124
_verification:
124125
1. All connections are correctly disabled after enabling Airplane Mode.
125-
2. All connections are correctly re-established after disabling Airplane Mode.
126+
2. All connections are correctly re-established after disabling Airplane Mode.

providers/base/units/networking/packaging.pxu

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
unit: packaging meta-data
22
os-id: debian
3-
Depends: ntpdate, net-tools, ethtool
3+
Depends: net-tools, ethtool
4+
5+
unit: packaging meta-data
6+
os-id: ubuntu
7+
os-version-id: < 22.04
8+
Depends: ntpdate
9+
10+
unit: packaging meta-data
11+
os-id: ubuntu
12+
os-version-id: >= 22.04
13+
Depends: ntpsec-ntpdate
414

515
unit: packaging meta-data
616
os-id: debian

0 commit comments

Comments
 (0)