Support #18874
Updated by Tom Clegg 7 months ago
Import entire workbench2 history into main Arvados repo. Want to preserve the commit hashes, so wb2 history will go back to a different root commit. Merge point will move workbench2 to arvados/apps/workbench2 Update build scripts, arvados-boot, arvbox etc to reflect new location of workbench2 inside the main tree. From discussion: Tom will figure out the git merge and updating run-tests to be able to perform the workbench2 workbench 2 tests. Once this is ready Tom & Lucas will update Jenkins & other scripts (eg package building). Temporarily (after the initial subtree merge into the arvados repo, but before we have stopped pushing changes to the workbench2 repo) this is the recipe for syncing changes from main @ workbench2.git to main @ arvados.git/services/workbench2: <pre> $ git fetch git@git.arvados.org:arvados-workbench2 main:workbench2-main $ git subtree merge -P services/workbench2 workbench2-main </pre> Use a commit message like this, to satisfy git.arvados.org policies: <pre> Merge branch 'main' from workbench2.git refs #18874 Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com> </pre>