New buildbot ignores sub-module branches #88432

New Issue

Julian Eisel · 2021-05-20T16:23:15+02:00

Julian Eisel commented

2021-05-20 16:23:15 +02:00

Some branches (including one used in the Spright Fright production) require a certain add-ons branch to be used. So far the way to do this was by setting a submodule branch in Blender's make update. E.g. like here {https://developer.blender.org/diffusion/B/browse/asset-browser-poselib/build_files/utils/make_update.py$177-183}:

submodules = [
	        ("release/scripts/addons", "asset-browser-poselib"),
	        ("release/scripts/addons_contrib", branch),
	        ("release/datafiles/locale", branch),
	        ("source/tools", branch),
	    ]

The new buildbot doesn't checkout the branch as specified anymore, meaning the builds might not be usable for testing.

In the Blender Studio, animators use this to work with the asset-browser-poselib branch, which is developed in partnership with Spright Fright production.

Some branches (including one used in the Spright Fright production) require a certain add-ons branch to be used. So far the way to do this was by setting a submodule branch in Blender's `make update`. E.g. like here {https://developer.blender.org/diffusion/B/browse/asset-browser-poselib/build_files/utils/make_update.py$177-183}: ```lang=py submodules = [ ("release/scripts/addons", "asset-browser-poselib"), ("release/scripts/addons_contrib", branch), ("release/datafiles/locale", branch), ("source/tools", branch), ] ``` The new buildbot doesn't checkout the branch as specified anymore, meaning the builds might not be usable for testing. In the Blender Studio, animators use this to work with the `asset-browser-poselib` branch, which is developed in partnership with Spright Fright production.

Julian Eisel commented

2021-05-20 16:23:15 +02:00

Added subscriber: @JulianEisel

James Monteath was assigned by Julian Eisel

2021-05-20 16:23:43 +02:00

James Monteath commented

2021-05-20 16:37:02 +02:00

I actually fixed an issue regarding how it this was done as it was not working correctly.
I will add a config to override the default being master.
I will run test on your this specific branch.

You can check in the logs in the update-code step too verify that it was done correctly.

I actually fixed an issue regarding how it this was done as it was not working correctly. I will add a config to override the default being master. I will run test on your this specific branch. You can check in the logs in the `update-code` step too verify that it was done correctly.

James Monteath commented

2021-05-20 16:47:21 +02:00

Do you want this branch to be nightly also ?

Dalai Felinto commented

2021-05-20 16:48:48 +02:00

Changed status from 'Needs Triage' to: 'Confirmed'

Julian Eisel commented

2021-05-20 17:00:21 +02:00

Added subscriber: @ZedDB

Julian Eisel commented

2021-05-20 17:00:21 +02:00

Thanks @ponderz! I can't spend time on this right now unfortunately, but will keep an eye on things.

In #88432#1163474, @ponderz wrote:
Do you want this branch to be nightly also ?

That would be great! (Not sure if the builds are triggered manually currently. I think @ZedDB handles that.)

Thanks @ponderz! I can't spend time on this right now unfortunately, but will keep an eye on things. > In #88432#1163474, @ponderz wrote: > Do you want this branch to be nightly also ? That would be great! (Not sure if the builds are triggered manually currently. I think @ZedDB handles that.)

Sebastian Parborg commented

2021-05-20 17:03:30 +02:00

I guess these could be updated nightly, yes.
This way the artists at the studio don't have to manually trigger builds (that can take a long time to finish for windows)

I guess these could be updated nightly, yes. This way the artists at the studio don't have to manually trigger builds (that can take a long time to finish for windows)

James Monteath commented

2021-05-20 18:04:19 +02:00

For branch this output is expected.
Can be reviewed in the update-code step

Updating Submodules

git fetch origin
git checkout asset-browser-poselib
Switched to branch 'asset-browser-poselib'
Your branch is up to date with 'origin/asset-browser-poselib'.
git pull --rebase origin asset-browser-poselib
From git.blender.org:blender-addons
 * branch              asset-browser-poselib -> FETCH_HEAD
Already up to date.
Current branch asset-browser-poselib is up to date.
git pull --rebase origin master
From git.blender.org:blender-addons-contrib
 * branch            master     -> FETCH_HEAD
Already up to date.
Current branch master is up to date.
git pull --rebase origin master
From git.blender.org:blender-translations
 * branch            master     -> FETCH_HEAD
Already up to date.
Current branch master is up to date.
git pull --rebase origin master
From git.blender.org:blender-dev-tools
 * branch            master     -> FETCH_HEAD
Already up to date.

For branch this output is expected. Can be reviewed in the `update-code` step ``` Updating Submodules git fetch origin git checkout asset-browser-poselib Switched to branch 'asset-browser-poselib' Your branch is up to date with 'origin/asset-browser-poselib'. git pull --rebase origin asset-browser-poselib From git.blender.org:blender-addons * branch asset-browser-poselib -> FETCH_HEAD Already up to date. Current branch asset-browser-poselib is up to date. git pull --rebase origin master From git.blender.org:blender-addons-contrib * branch master -> FETCH_HEAD Already up to date. Current branch master is up to date. git pull --rebase origin master From git.blender.org:blender-translations * branch master -> FETCH_HEAD Already up to date. Current branch master is up to date. git pull --rebase origin master From git.blender.org:blender-dev-tools * branch master -> FETCH_HEAD Already up to date. ```

Brecht Van Lommel commented

2021-05-20 18:05:14 +02:00

Added subscriber: @brecht

Brecht Van Lommel commented

2021-05-20 18:05:14 +02:00

Can't we just use the make_update.py from the Blender repo, that auto-detects branches?

There are some cases where it makes sense to move code into the buildbot repo, but this one doesn't make sense to me.

Can't we just use the `make_update.py` from the Blender repo, that auto-detects branches? There are some cases where it makes sense to move code into the buildbot repo, but this one doesn't make sense to me.

James Monteath commented

2021-05-20 21:31:06 +02:00

Can't do that.
That script did not work in certain circumstances.

We could eventually merge it back in once we proper configurations that can drive it.

Can't do that. That script did not work in certain circumstances. We could eventually merge it back in once we proper configurations that can drive it.

James Monteath commented

2021-05-20 21:35:32 +02:00

I do need to explain a bit more though.
But that's lengthy discussion.

I do need to explain a bit more though. But that's lengthy discussion.

James Monteath commented

2021-05-21 08:20:13 +02:00

Changed status from 'Confirmed' to: 'Resolved'

James Monteath closed this issue

2021-05-21 08:20:13 +02:00

James Monteath commented

2021-05-27 08:23:16 +02:00

The approach has been reworked as discussed with @brecht
Will update Wiki with details during deployment today.