| chandankumar | sean-k-mooney: Hello, https://review.opendev.org/c/openstack/cyborg/+/981754/1#message-3ee08cf51f9710d8e2c8000e48b6e2f6047e36f7 on 2025.2 tox pep8 job is failing while checking for cherry picks here. It worked in 2026.1 but it fails in 2025.2 and 2025.1 | 13:10 |
|---|---|---|
| sean-k-mooney | that is because i have not cherry picked the cherry pick helper script to those yet | 13:11 |
| sean-k-mooney | https://review.opendev.org/c/openstack/cyborg/+/982300 need to be merged first then i need to pull it to 2025.2 adn 2025.1 before that will pass | 13:11 |
| sean-k-mooney | sorry wrong link | 13:12 |
| sean-k-mooney | https://review.opendev.org/c/openstack/cyborg/+/981529 | 13:12 |
| sean-k-mooney | https://review.opendev.org/c/openstack/cyborg/+/981754 and https://review.opendev.org/c/openstack/cyborg/+/977838 shoudl fix it but i need to update the latter | 13:13 |
| chandankumar | sorry tox -e pep8 failing on cherry-pick script itself i.e. 981754: Fix check-cherry-picks.sh for numeric stable branches | https://review.opendev.org/c/openstack/cyborg/+/981754 | 13:15 |
| sean-k-mooney | ill need ot look into it unless you have time but any fix needs to be made on master first | 13:15 |
| sean-k-mooney | i saw the comment that perhaps i need to defautl to HEAD or and replied that a better fix woudl be to remove the "" | 13:16 |
| chandankumar | let me try with removing "" | 13:16 |
| sean-k-mooney | without it when the viarble is not defiend hte partmer just wont be passed to the command | 13:16 |
| sean-k-mooney | so that should work | 13:16 |
| sean-k-mooney | we could default to HEAD but that might break in other ways | 13:17 |
| sean-k-mooney | this script came form nova and there we do not defualt to HEAD but we also do not quote https://github.com/openstack/nova/blob/master/tools/check-cherry-picks.sh | 13:18 |
| sean-k-mooney | so i think that is hte regression | 13:18 |
| sean-k-mooney | if you fix it on master we cna backport that quickly to the branches where its already merged and update the unmerged ones to squash in your fix | 13:20 |
| chandankumar | removing quotes works | 13:25 |
| chandankumar | let me push the patch | 13:25 |
| opendevreview | chandan kumar proposed openstack/cyborg master: Fix check-cherry-picks.sh empty commit_hash argument https://review.opendev.org/c/openstack/cyborg/+/982644 | 13:29 |
| chandankumar | sean-k-mooney: ^^ | 13:29 |
| sean-k-mooney | i wonder why that works on 2026.1 perhaps because in someplaces in ci its using master deps? | 13:32 |
| sean-k-mooney | i woudl have prefered to keep the ${} syntax consitently by the way but we can | 13:33 |
| sean-k-mooney | but the file is not using tha tat the moment | 13:33 |
| sean-k-mooney | so can you update | 13:34 |
| sean-k-mooney | https://review.opendev.org/c/openstack/cyborg/+/982644/1/tools/check-cherry-picks.sh#22 | 13:34 |
| sean-k-mooney | so it no tthe only place using that | 13:34 |
| chandankumar | ok good catch | 13:34 |
| sean-k-mooney | chandankumar: otherwise this looks good to me | 13:34 |
| opendevreview | chandan kumar proposed openstack/cyborg master: Fix check-cherry-picks.sh empty commit_hash argument https://review.opendev.org/c/openstack/cyborg/+/982644 | 13:35 |
| sean-k-mooney | chandankumar: can you submit a cherry-pick of tha to 2026.1 as well and lets confirm that passes there before merging | 13:58 |
| sean-k-mooney | ideally we woudl squash it into 2025.2 as well since that is where it was failing | 13:58 |
| sean-k-mooney | but i guess its better to just test this locally | 13:59 |
| sean-k-mooney | since we cant eaislly test this in ci so ill see if i cna do that later today | 13:59 |
| sean-k-mooney | to test it properly i need to have a seprate git repo where i can merge the changes into the relevent branhces 1 by one | 14:00 |
| chandankumar | 2026.1 backport https://review.opendev.org/c/openstack/cyborg/+/982665 | 14:38 |
| sean-k-mooney | thanks this wil proably fail ci. but i can test it locally by tryign the backport without the orgianl on master then i can apply the change to master and i should see that runign it on stable then works | 14:59 |
| chandankumar | ok thanks! | 15:01 |
| sean-k-mooney | becaus of how these scritp work you kindof need to test them with clean repos each time | 15:01 |
| sean-k-mooney | which iskind of annoying but its the only way to test it properly | 15:02 |
| sean-k-mooney | you can use existing repso but you need to be carful to rest the head fo the relevent brnahces to create the correct view of the repo | 15:02 |
| sean-k-mooney | i.e. testing with and without the change merged into your master branch locally | 15:03 |
| chandankumar | Ok | 15:10 |
| chandankumar | I squashed 2025.2 cherry pick | 15:10 |
| chandankumar | or are you also updating it? | 15:10 |
| chandankumar | https://review.opendev.org/c/openstack/cyborg/+/981754 for 2025.2 | 15:12 |
| sean-k-mooney | no im workign on the watcher-dashboard patch reorder so ill pick up and test the updated 2025.2 patch when i start my testing | 15:16 |
| sean-k-mooney | thanks for updating it | 15:16 |
| chandankumar | gmaan: Hello, Please have a cyborg grenade patch https://review.opendev.org/c/openstack/cyborg/+/979802 when free, thank you! | 17:55 |
| gmaan | chandankumar: good timing. I am on that, checking the jobs log | 17:56 |
| chandankumar | ++ thank you! | 17:56 |
| gmaan | lgtm +1 | 17:58 |
| opendevreview | chandan kumar proposed openstack/cyborg master: Add NVMe DevStack development guide and local.conf template https://review.opendev.org/c/openstack/cyborg/+/982711 | 18:55 |
| sean-k-mooney | gmaan: chandankumar ill take a look at the greade job again during the week but we need to fix the cherry pick sctip adn cyborg status command backports on the sable branches before we can proceed with that on master | 19:11 |
| sean-k-mooney | so it will likely take a week or two to resolve those issues | 19:11 |
| sean-k-mooney | with that said once we merge the master version we can look at cherry-picking the grenade job to 2026.1 | 19:12 |
| sean-k-mooney | im not sure if we want to also backport that to 2025.2 and 2025.1 but if we do we shoudl consdier if we only backport the grenade part and not the skiplevel alwasy part | 19:13 |
| gmaan | yes, skip level not required on 2025.2 and 2025.1 because of their previous base release to upgrade not in maintenance | 19:14 |
| sean-k-mooney | 2024.1 is alreay unmaintaiend and we dont test upgrades form unmaineted branches | 19:14 |
| sean-k-mooney | ya that | 19:15 |
| sean-k-mooney | 2024.2 will be eol soon too | 19:15 |
| gmaan | but greande job can be backported till 2025.1 (though 2024.2 is going to EOL soon) | 19:15 |
| gmaan | yeah, I will say if it is more work then doing till 2025.2 is worth | 19:15 |
| sean-k-mooney | ya so 2026.1 is my main focus and im ont againt 2025.2 or 2025.1 if it works | 19:16 |
| gmaan | ++ indeed | 19:16 |
| sean-k-mooney | gmaan: did the nodeset change merged for grenade by the way? | 19:17 |
| gmaan | sean-k-mooney: I think not yet, let me ping dan also once he will be back | 19:17 |
| sean-k-mooney | ack | 19:17 |
Generated by irclog2html.py 4.1.0 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!