Skip to content

Commit 982d160

Browse files
ydirsonydirson
committed
install: replace 8.3 prereleases with 8.3.0 as base version for upgrades
Signed-off-by: Yann Dirson <[email protected]>
1 parent 024e768 commit 982d160

File tree

2 files changed

+24
-40
lines changed

2 files changed

+24
-40
lines changed

‎data.py-dist

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,13 @@ ISO_IMAGES: Dict[str, "IsoImageDef"] = {
132132
#'83nightlynet': {'path': "http://pxe/isos/xcp-ng-8.3-ci-netinstall-latest"},
133133
# 'net-url': 'fake",
134134
# 'net-only': True},
135-
'83rc1': {'path': "8.3/xcp-ng-8.3.0-rc1.iso",
136-
#'net-url': "http://server/installers/xcp-ng/8.3-rc1",
137-
},
135+
'830': {'path': "8.3/xcp-ng-8.3.0.iso",
136+
#'net-url': "http://server/installers/xcp-ng/8.3.0",
137+
},
138138
## FIXME: only a compensation for the lack of 83nightlynet
139-
#'83rcnet': {'path': "8.3/xcp-ng-8.3.0-rc1-netinstall.iso",
140-
# 'net-url': "http://server/installers/xcp-ng/8.3-rc1",
141-
# 'net-only': True},
142-
'83b2': {'path': "8.3/xcp-ng-8.3.0-beta2.iso",
143-
#'net-url': "http://server/installers/xcp-ng/8.3-beta2",
144-
},
145-
'83b1': {'path': "8.3/xcp-ng-8.3.0-beta1.iso",
146-
#'net-url': "http://server/installers/xcp-ng/8.3-beta1",
147-
},
139+
#'830net': {'path': "8.3/xcp-ng-8.3.0-netinstall.iso",
140+
# 'net-url': "http://server/installers/xcp-ng/8.3.0",
141+
# 'net-only': True},
148142
'82nightly': {'path': os.environ.get("XCPNG82_NIGHTLY",
149143
"http://unconfigured.iso"),
150144
'unsigned': True},
@@ -252,8 +246,8 @@ BASE_ANSWERFILES = dict(
252246
)
253247

254248
IMAGE_EQUIVS: Dict[str, str] = {
255-
# 'install.test::Nested::install[bios-83rc1-ext]-vm1-607cea0c825a4d578fa5fab56978627d8b2e28bb':
256-
# 'install.test::Nested::install[bios-83rc1-ext]-vm1-addb4ead4da49856e1d2fb3ddf4e31027c6b693b',
249+
# 'install.test::Nested::install[bios-830-ext]-vm1-607cea0c825a4d578fa5fab56978627d8b2e28bb':
250+
# 'install.test::Nested::install[bios-830-ext]-vm1-addb4ead4da49856e1d2fb3ddf4e31027c6b693b',
257251
}
258252

259253
# compatibility settings for older tests

‎tests/install/test.py

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ class TestNested:
4343
@pytest.mark.parametrize("local_sr", ("nosr", "ext", "lvm"))
4444
@pytest.mark.parametrize("package_source", ("iso", "net"))
4545
@pytest.mark.parametrize("iso_version", (
46-
"83nightly", "83rcnet",
47-
"83rc1", "83b2", "83b1",
46+
"83nightly", "830net",
47+
"830",
4848
"82nightly",
4949
"821.1",
5050
"81", "80", "76", "75",
@@ -98,8 +98,8 @@ def test_install(self, vm_booted_with_installer, install_disk,
9898
@pytest.mark.parametrize("package_source", ("iso", "net"))
9999
@pytest.mark.parametrize("machine", ("host1", "host2"))
100100
@pytest.mark.parametrize("version", (
101-
"83nightly", "83rcnet",
102-
"83rc1", "83b2", "83b1",
101+
"83nightly", "830net",
102+
"830",
103103
"82nightly",
104104
"821.1",
105105
"81", "80",
@@ -148,10 +148,8 @@ def _test_firstboot(self, create_vms, mode, *, machine='DEFAULT', is_restore=Fal
148148
expected_rel_id = split_mode[-1]
149149
expected_rel = {
150150
"83nightly": "8.3.0",
151-
"83rcnet": "8.3.0",
152-
"83rc1": "8.3.0",
153-
"83b2": "8.3.0",
154-
"83b1": "8.3.0",
151+
"830net": "8.3.0",
152+
"830": "8.3.0",
155153
"82nightly": "8.2.1",
156154
"821.1": "8.2.1",
157155
"81": "8.1.0",
@@ -291,8 +289,8 @@ def _test_firstboot(self, create_vms, mode, *, machine='DEFAULT', is_restore=Fal
291289
@pytest.mark.parametrize("package_source", ("iso", "net"))
292290
@pytest.mark.parametrize("machine", ("host1", "host2"))
293291
@pytest.mark.parametrize("version", (
294-
"83nightly", "83rcnet",
295-
"83rc1", "83b2", "83b1",
292+
"83nightly", "830net",
293+
"830",
296294
"82nightly",
297295
"821.1",
298296
"81", "80",
@@ -316,15 +314,13 @@ def test_boot_inst(self, create_vms,
316314
@pytest.mark.parametrize("machine", ("host1", "host2"))
317315
@pytest.mark.parametrize(("orig_version", "iso_version"), [
318316
("83nightly", "83nightly"),
319-
("83rc1", "83nightly"),
320-
("83b2", "83nightly"),
321-
("83b1", "83nightly"),
317+
("830", "83nightly"),
322318
("821.1", "83nightly"),
323319
("81", "83nightly"),
324320
("80", "83nightly"),
325321
("xs8", "83nightly"),
326322
("ch821.1", "83nightly"),
327-
("83rcnet", "83rcnet"), # FIXME
323+
("830net", "830net"), # FIXME
328324
("82nightly", "82nightly"),
329325
("821.1", "82nightly"),
330326
("821.1", "821.1"),
@@ -354,15 +350,13 @@ def test_upgrade(self, vm_booted_with_installer, install_disk,
354350
@pytest.mark.parametrize("machine", ("host1", "host2"))
355351
@pytest.mark.parametrize("mode", (
356352
"83nightly-83nightly",
357-
"83rc1-83nightly",
358-
"83b2-83nightly",
359-
"83b1-83nightly",
353+
"830-83nightly",
360354
"821.1-83nightly",
361355
"81-83nightly",
362356
"80-83nightly",
363357
"xs8-83nightly",
364358
"ch821.1-83nightly",
365-
"83rcnet-83rcnet",
359+
"830net-830net",
366360
"82nightly-82nightly",
367361
"821.1-82nightly",
368362
"821.1-821.1",
@@ -381,15 +375,13 @@ def test_boot_upg(self, create_vms,
381375
@pytest.mark.parametrize("package_source", ("iso", "net"))
382376
@pytest.mark.parametrize(("orig_version", "iso_version"), [
383377
("83nightly-83nightly", "83nightly"),
384-
("83rc1-83nightly", "83nightly"),
385-
("83b2-83nightly", "83nightly"),
386-
("83b1-83nightly", "83nightly"),
378+
("830-83nightly", "83nightly"),
387379
("821.1-83nightly", "83nightly"),
388380
("81-83nightly", "83nightly"),
389381
("80-83nightly", "83nightly"),
390382
("xs8-83nightly", "83nightly"),
391383
("ch821.1-83nightly", "83nightly"),
392-
("83rcnet-83rcnet", "83rcnet"), # FIXME
384+
("830net-830net", "830net"), # FIXME
393385
("82nightly-82nightly", "82nightly"),
394386
("821.1-82nightly", "82nightly"),
395387
("821.1-821.1", "821.1"),
@@ -414,15 +406,13 @@ def test_restore(self, vm_booted_with_installer, install_disk,
414406
@pytest.mark.parametrize("package_source", ("iso", "net"))
415407
@pytest.mark.parametrize("mode", (
416408
"83nightly-83nightly-83nightly",
417-
"83rc1-83nightly-83nightly",
418-
"83b2-83nightly-83nightly",
419-
"83b1-83nightly-83nightly",
409+
"830-83nightly-83nightly",
420410
"821.1-83nightly-83nightly",
421411
"81-83nightly-83nightly",
422412
"80-83nightly-83nightly",
423413
"xs8-83nightly-83nightly",
424414
"ch821.1-83nightly-83nightly",
425-
"83rcnet-83rcnet-83rcnet", # FIXME
415+
"830net-830net-830net", # FIXME
426416
"82nightly-82nightly-82nightly",
427417
"821.1-82nightly-82nightly",
428418
"821.1-821.1-821.1",

0 commit comments

Comments
 (0)