Merge ~seb128/ubuntu-manual-tests:fix-id-conflict into ubuntu-manual-tests:main

Proposed by Sebastien Bacher
Status: Rejected
Rejected by: Brian Murray
Proposed branch: ~seb128/ubuntu-manual-tests:fix-id-conflict
Merge into: ubuntu-manual-tests:main
Diff against target: 17 lines (+1/-1)
1 file modified
definitions/pi_server_cases.xml (+1/-1)
Reviewer Review Type Date Requested Status
Brian Murray Disapprove
Review via email: mp+431759@code.launchpad.net

Description of the change

Sorry about that, I added canary tests through the webUI before knowing about the vcs. Once the change accepted I will push the test with the new reference to the server and update the list of raspi tests to correctly include it

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

I actually see RaspberryPi CM4 8GB Desktop as being test id 1750. I'll go ahead and fix the branch and reject this MP. Thanks for bringing this up!

review: Disapprove
Revision history for this message
Brian Murray (brian-murray) wrote :

And I'm wrong there are two CM4 8GB tests:

1750_RaspberryPi CM4 8GB Desktop
1743_RaspberryPi CM4 8GB Post-install

Regardless I've renumbered 1743 which conflicted to 1777 as some new tests were added.

Unmerged commits

74c6a33... by Sebastien Bacher

Use a different id number to avoid a conflict

One of the raspi tests conflicts with a canary test added through the webUI,
update the reference to the next availabe one

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/definitions/pi_server_cases.xml b/definitions/pi_server_cases.xml
2index 04b445a..ac6bd6d 100644
3--- a/definitions/pi_server_cases.xml
4+++ b/definitions/pi_server_cases.xml
5@@ -491,7 +491,7 @@
6 <ut:include ref="wifi"><ut:define name="intf">wlan0</ut:define></ut:include>
7 </ut:case>
8
9- <ut:case id="1743_RaspberryPi CM4 8GB Post-install">
10+ <ut:case id="1775_RaspberryPi CM4 8GB Post-install">
11 <ut:define name="model">Raspberry Pi Compute Module 4 8GB</ut:define>
12 <ut:define name="post-install">
13 <p>Before booting your CM4 with the new image, edit config.txt on the boot
14diff --git a/testcases/image/1743_RaspberryPi CM4 8GB Post-install b/testcases/image/1775_RaspberryPi CM4 8GB Post-install
15similarity index 100%
16rename from testcases/image/1743_RaspberryPi CM4 8GB Post-install
17rename to testcases/image/1775_RaspberryPi CM4 8GB Post-install

Subscribers

People subscribed via source and target branches