Skip to content

Commit 436323d

Browse files
committed
CI get test NTP servers from integration_config.yml.j2
Signed-off-by: Justin Cinkelj <justin.cinkelj@xlab.si>
1 parent 0c7f11b commit 436323d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

tests/integration/integration_config.yml.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ sc_config:
3535
# pool.ntp.org servers frequently return KOD.
3636
# time.google.com does not complain.
3737
source: time.google.com
38+
# We need 2 NTP servers.
39+
# Set them up per ci-infra/ntp-chrony/Readme.md.
40+
time_server_a: 10.5.11.5
41+
time_server_b: 10.5.11.75
3842
time_zone:
3943
zone: US/Eastern
4044
dns_config:

tests/integration/targets/time_server/tasks/01_time_server_info.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
vars:
88
actual_uuid: "timesource_guid"
9-
# We need 2 NTP servers.
10-
# Set them up per ci-infra/ntp-chrony/Readme.md.
11-
actual_host: "10.5.11.5"
9+
actual_host: "{{ sc_config[sc_host].time_server.time_server_a }}"
1210

1311
block:
1412
# -------------------------------------------------------

tests/integration/targets/time_server/tasks/02_time_server.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
SC_PASSWORD: "{{ sc_config[sc_host].sc_password }}"
66
SC_TIMEOUT: "{{ sc_timeout * 10 }}"
77
vars:
8-
# We need 2 NTP servers.
9-
# Set them up per ci-infra/ntp-chrony/Readme.md.
10-
time_server_a: 10.5.11.5
11-
time_server_b: 10.5.11.75
8+
time_server_a: "{{ sc_config[sc_host].time_server.time_server_a }}"
9+
time_server_b: "{{ sc_config[sc_host].time_server.time_server_b }}"
1210
actual_uuid: timesource_guid
1311

1412
block:

0 commit comments

Comments
 (0)