Skip to content

Commit b0a37d0

Browse files
frankdavidIDX GitHub Automation
andauthored
test: Refactor IC-OS image config in system_tests.bzl for more clarity (#8436)
- Instead of the `uses_*` pattern, pass `hostos` and `setupos` args to `system_test` similarly to `guestos`. - Factor out repeating parts of the config in `system_tests.bzl` into functions - Improve handling of mainnet dev images. - Behavior change: `recovery-dev` now builds the initial update image corresponding to the base image (both from `//ic-os/guestos/envs/recovery-dev`), whereas previously the two weren't consistent. The test still passes and I got green light from @andrewbattat who originally wrote the tests. --------- Co-authored-by: IDX GitHub Automation <infra+github-automation@dfinity.org>
1 parent 8357b2a commit b0a37d0

File tree

5 files changed

+149
-150
lines changed

5 files changed

+149
-150
lines changed

rs/tests/nested/BUILD.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ system_test_nns(
4848
name = "registration",
4949
env = MAINNET_ENV,
5050
flaky = True, # flakiness rate of over 2% over the month from 2025-02-11 till 2025-03-11.
51+
setupos = True,
5152
tags = ["long_test"], # since it takes longer than 5 minutes.
5253
test_timeout = "eternal",
53-
uses_setupos_img = True,
5454
runtime_deps = IC_GATEWAY_RUNTIME_DEPS,
5555
deps = [
5656
# Keep sorted.
@@ -81,10 +81,10 @@ system_test_nns(
8181
env = MAINNET_ENV,
8282
flaky = True,
8383
guestos_update = "test",
84+
setupos = True,
8485
tags = ["long_test"],
8586
test_driver_target = ":guestos_upgrade_test_bin",
8687
test_timeout = "eternal",
87-
uses_setupos_img = True,
8888
runtime_deps = IC_GATEWAY_RUNTIME_DEPS,
8989
)
9090

@@ -94,10 +94,10 @@ system_test_nns(
9494
flaky = True,
9595
guestos = "mainnet_latest_dev", # necessary for configuring NNS public key
9696
guestos_update = True,
97+
setupos = "mainnet_latest_dev",
9798
tags = ["long_test"],
9899
test_driver_target = ":guestos_upgrade_test_bin",
99100
test_timeout = "eternal",
100-
uses_setupos_mainnet_latest_img = True,
101101
runtime_deps = IC_GATEWAY_RUNTIME_DEPS | {
102102
"NODE_OPERATOR_PRIV_KEY_PATH": "//ic-os/setupos:config/node_operator_private_key.pem",
103103
},
@@ -122,11 +122,11 @@ system_test_nns(
122122
name = "hostos_upgrade_smoke_test",
123123
env = MAINNET_ENV,
124124
flaky = True,
125+
hostos_update = "test",
126+
setupos = True,
125127
tags = ["long_test"],
126128
test_driver_target = ":hostos_upgrade_test_bin",
127129
test_timeout = "eternal",
128-
uses_hostos_test_update = True,
129-
uses_setupos_img = True,
130130
runtime_deps = IC_GATEWAY_RUNTIME_DEPS,
131131
)
132132

@@ -135,11 +135,11 @@ system_test_nns(
135135
name = "hostos_upgrade_from_latest_release_to_current",
136136
flaky = True, # flakiness rate of 5% over the month from 2025-02-11 till 2025-03-11.
137137
guestos = "mainnet_latest_dev", # necessary for configuring NNS public key
138+
hostos_update = True,
139+
setupos = "mainnet_latest_dev",
138140
tags = ["long_test"],
139141
test_driver_target = ":hostos_upgrade_test_bin",
140142
test_timeout = "eternal",
141-
uses_hostos_update = True,
142-
uses_setupos_mainnet_latest_img = True,
143143
runtime_deps = IC_GATEWAY_RUNTIME_DEPS | {
144144
"NODE_OPERATOR_PRIV_KEY_PATH": "//ic-os/setupos:config/node_operator_private_key.pem",
145145
},

rs/tests/nested/nns_recovery/BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ system_test_nns(
4545
env = ENV,
4646
flaky = True,
4747
guestos_update = "test",
48+
setupos = True,
4849
tags = ["long_test"],
4950
test_timeout = "eternal",
50-
uses_setupos_img = True,
5151
runtime_deps = RUNTIME_DEPS,
5252
deps = [
5353
# Keep sorted.
@@ -66,12 +66,12 @@ system_test_nns(
6666
env = ENV,
6767
flaky = True,
6868
guestos_update = "test",
69+
setupos = True,
6970
tags = [
7071
"manual",
7172
"system_test_large",
7273
],
7374
test_timeout = "eternal",
74-
uses_setupos_img = True,
7575
runtime_deps = RUNTIME_DEPS,
7676
deps = [
7777
# Keep sorted.
@@ -86,9 +86,9 @@ system_test_nns(
8686
env = ENV,
8787
flaky = True,
8888
guestos_update = "test",
89+
setupos = True,
8990
tags = ["long_test"],
9091
test_timeout = "eternal",
91-
uses_setupos_img = True,
9292
runtime_deps = RUNTIME_DEPS,
9393
deps = [
9494
# Keep sorted.
@@ -106,9 +106,9 @@ system_test_nns(
106106
env = ENV,
107107
flaky = True,
108108
guestos_update = "test",
109+
setupos = True,
109110
tags = ["long_test"],
110111
test_timeout = "eternal",
111-
uses_setupos_img = True,
112112
runtime_deps = RUNTIME_DEPS,
113113
deps = [
114114
# Keep sorted.
@@ -126,9 +126,9 @@ system_test_nns(
126126
env = ENV,
127127
flaky = True,
128128
guestos_update = "test",
129+
setupos = True,
129130
tags = ["long_test"],
130131
test_timeout = "eternal",
131-
uses_setupos_img = True,
132132
runtime_deps = RUNTIME_DEPS,
133133
deps = [
134134
# Keep sorted.

rs/tests/node/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ system_test(
9898
system_test(
9999
name = "launch_single_host",
100100
guestos = False,
101+
setupos = True,
101102
tags = [
102103
"dynamic_testnet",
103104
"manual",
104105
],
105-
uses_setupos_img = True,
106106
deps = [
107107
# Keep sorted.
108108
"//rs/tests/driver:ic-system-test-driver",

0 commit comments

Comments
 (0)