Support #18874
Updated by Tom Clegg 11 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 tests.
Once this is ready Tom & Lucas will update Jenkins & other scripts (eg package building).
h2. Updating services/workbench2 during transition period
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>
h2. Transition progress
steps:
* ✅ add Jenkins jobs for testing the version of workbench2 in the arvados repo
* ✅ merge latest main branch of workbench2 into the arvados tree at services/workbench2/ using git-subtree
* ✅ use the new @arvados-server install@ to rebuild the machine image jenkins uses to run arvados tests (see ENOSPC note above)
* ✅ run Jenkins jobs manually, fix any other problems that still prevent services/workbench2 tests from passing
* ✅ configure Jenkins to run the new workbench2 tests as part of the developer-run-tests and run-tests pipelines
* ✅ update arvbox to use checked-out services/workbench2 instead of arvados-workbench2.git
* ✅ update debian package-building to build workbench2 packages from arvados.git/services/workbench2
* ✅ stop building packages from arvados-workbench2.git
* ✅ merge latest main branch from arvados-workbench2.git into arvados.git/services/workbench2
* ✅ ▢ prohibit pushing updates to -main main branch at- at arvados-workbench2.git (from now on devs will push to arvados.git/services/workbench2 instead)