10762 2016-12-03 11:34:40 +0000 patchwork: Enable automatic status update when patches are merged for all projects 2017-12-06 17:19:18 +0000 1 1 6 Yocto Project Subprojects Patchwork/Patchtest Patchwork 2.3 x86 Multiple RESOLVED FIXED Medium+ enhancement 2.3 M2 1 jose.a.lamego jose.a.lamego benjamin.esquivel bluelightning leonardo.sandoval.gonzalez Martin.Jansa mhalstead patrick.ohly --- --- No (bug/feature does not impact docs) oldest_to_newest 68825 0 jose.a.lamego 2016-12-03 11:34:40 +0000 Currently only oe-core project automatically updates patches state to Accepted when they're merged. This feature should be enabled for all projects in patchwork. 68993 1 jose.a.lamego 2016-12-09 17:29:34 +0000 OE's git repositories are using a git-hook older than the asynchronous one that is used only for the oe-core project. All repositories will be configured to use the same script, since this script seems to be causing the lack of updates for those projects. All of other project configurations have been verified and no difference was found between them. Even manual state updates can be made. 69123 2 jose.a.lamego 2016-12-14 15:09:43 +0000 All of the OE's git repositories were configured to use the asynchronous githook in Dec 13. Waiting for confirmation that the automatic updates are working as expected. 69445 3 jose.a.lamego 2017-01-03 17:27:18 +0000 Logs show that the githook is working for "oe" and "bitbake" projects as well as "oe-core". The other projects should also be updated upon future merging. Please let me know if other behavior is detected. 69476 4 Martin.Jansa 2017-01-04 13:19:32 +0000 Today I was pushing some new changes to master and master-next, everything looked OK (push was much faster probably because of asynchronous hook you mentioned before). It wasn't showing any output from the hook, so I assumed everything is OK, but now some people on IRC are reporting missing branches and indeed master and master-next branches are gone: OE @ ~/meta-openembedded $ git remote prune origin Pruning origin URL: git://git.openembedded.org/meta-openembedded * [pruned] origin/master * [pruned] origin/master-next refs/remotes/origin/HEAD has become dangling! And I cannot just repush them: OE @ ~/meta-openembedded $ git push origin master Everything up-to-date OE @ ~/meta-openembedded $ git push origin master-next Everything up-to-date Can you please check what went wrong on the server and if it's related to the new hook or the recent infra update? 69478 5 Martin.Jansa 2017-01-04 13:43:05 +0000 interesting the same happened in -contrib repository which probably doesn't have this hook The push looked normal: OE @ ~/meta-openembedded $ git push -f contrib jansa/master Counting objects: 38, done. Delta compression using up to 8 threads. Compressing objects: 100% (38/38), done. Writing objects: 100% (38/38), 12.83 KiB | 0 bytes/s, done. Total 38 (delta 22), reused 0 (delta 0) To git+ssh://git.openembedded.org/meta-openembedded-contrib fcb6d27..6cdb9f6 jansa/master -> jansa/master but the branch is gone now: http://git.openembedded.org/meta-openembedded-contrib/log/?h=jansa/master 69482 6 leonardo.sandoval.gonzalez 2017-01-04 17:27:57 +0000 (In reply to comment #4) > Today I was pushing some new changes to master and master-next, everything > looked OK (push was much faster probably because of asynchronous hook you > mentioned before). > > It wasn't showing any output from the hook, so I assumed everything is OK, > but now some people on IRC are reporting missing branches and indeed master > and master-next branches are gone: > > OE @ ~/meta-openembedded $ git remote prune origin > Pruning origin > URL: git://git.openembedded.org/meta-openembedded > * [pruned] origin/master > * [pruned] origin/master-next > refs/remotes/origin/HEAD has become dangling! > > And I cannot just repush them: > OE @ ~/meta-openembedded $ git push origin master > Everything up-to-date > OE @ ~/meta-openembedded $ git push origin master-next > Everything up-to-date > > Can you please check what went wrong on the server and if it's related to > the new hook or the recent infra update? I believe this is something not related to the script discussed on this bug entry but either Jose or Michael have more insight. Martin, I followed your steps and I saw no pruning on my local branches. ---- snip ---- $ git remote prune origin $ git remote -v origin git://git.openembedded.org/openembedded-core (fetch) origin git://git.openembedded.org/openembedded-core (push) ---- snip ---- Any other step that I am missing? 69491 7 jose.a.lamego 2017-01-04 19:22:06 +0000 (In reply to comment #6) > (In reply to comment #4) > > Today I was pushing some new changes to master and master-next, everything > > looked OK (push was much faster probably because of asynchronous hook you > > mentioned before). > > > > It wasn't showing any output from the hook, so I assumed everything is OK, > > but now some people on IRC are reporting missing branches and indeed master > > and master-next branches are gone: > > > > OE @ ~/meta-openembedded $ git remote prune origin > > Pruning origin > > URL: git://git.openembedded.org/meta-openembedded > > * [pruned] origin/master > > * [pruned] origin/master-next > > refs/remotes/origin/HEAD has become dangling! > > > > And I cannot just repush them: > > OE @ ~/meta-openembedded $ git push origin master > > Everything up-to-date > > OE @ ~/meta-openembedded $ git push origin master-next > > Everything up-to-date > > > > Can you please check what went wrong on the server and if it's related to > > the new hook or the recent infra update? > > I believe this is something not related to the script discussed on this bug > entry but either Jose or Michael have more insight. > > Martin, I followed your steps and I saw no pruning on my local branches. > > ---- snip ---- > $ git remote prune origin > $ git remote -v > origin git://git.openembedded.org/openembedded-core (fetch) > origin git://git.openembedded.org/openembedded-core (push) > ---- snip ---- > > Any other step that I am missing? I believe it is very unlike for the githook to mess with branches, however, I'll ask Michael to take a look at the server and see what he can find. 69492 8 Martin.Jansa 2017-01-04 19:37:03 +0000 > Any other step that I am missing? different project, try it in meta-openembedded(-contrib) 69517 9 mhalstead 2017-01-05 15:11:04 +0000 This hook is not causing the problem with unavailable branches. It is a umask problem with gitolite and the git daemon. 69531 10 jose.a.lamego 2017-01-05 16:24:56 +0000 I'm closing this bug since the branches issue is not related. Let me know if I should file a new bug to track that.