Project

General

Profile

Actions
Copy link

Support #18874

open

Merge workbench2 history into main Arvados repo

Added by Peter Amstutz about 1 year ago. Updated 11 days ago.

Status:
New
Priority:
Normal
Assigned To:
Lucas Di Pentima
Category:
Workbench2
Target version:
To be groomed
Start date:
Due date:
% Done:

0%

Estimated time:
Story points:
1.0

Description

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.

Related issues

Blocked by Arvados - Support #18873: Add hooks to limit which paths of arvados repo non-curii employees can push toResolvedWard Vandewege

Actions
Actions
Copy link
 #1

Updated by Peter Amstutz about 1 year ago

  • Blocked by Support #18873: Add hooks to limit which paths of arvados repo non-curii employees can push to added
Actions
Copy link
 #2

Updated by Peter Amstutz about 1 year ago

  • Target version set to Kanban
Actions
Copy link
 #3

Updated by Peter Amstutz 12 months ago

  • Target version changed from Kanban to 2022-04-27 Sprint
  • Project changed from 40 to Arvados
Actions
Copy link
 #4

Updated by Peter Amstutz 12 months ago

  • Target version changed from 2022-04-27 Sprint to 2022-05-11 sprint
Actions
Copy link
 #5

Updated by Peter Amstutz 11 months ago

  • Target version changed from 2022-05-11 sprint to 2022-05-25 sprint
Actions
Copy link
 #6

Updated by Peter Amstutz 11 months ago

  • Target version changed from 2022-05-25 sprint to 2022-06-08 sprint
Actions
Copy link
 #7

Updated by Peter Amstutz 11 months ago

  • Target version changed from 2022-06-08 sprint to 2022-06-22 Sprint
Actions
Copy link
 #8

Updated by Peter Amstutz 10 months ago

  • Target version changed from 2022-06-22 Sprint to 2022-07-06
Actions
Copy link
 #9

Updated by Peter Amstutz 9 months ago

  • Target version changed from 2022-07-06 to 2022-07-20
Actions
Copy link
 #10

Updated by Peter Amstutz 9 months ago

  • Target version changed from 2022-07-20 to 2022-08-03 Sprint
Actions
Copy link
 #11

Updated by Peter Amstutz 9 months ago

  • Category set to Workbench2
Actions
Copy link
 #12

Updated by Peter Amstutz 8 months ago

  • Target version changed from 2022-08-03 Sprint to 2022-08-17 sprint
Actions
Copy link
 #13

Updated by Peter Amstutz 8 months ago

  • Target version changed from 2022-08-17 sprint to 2022-08-31 sprint
Actions
Copy link
 #14

Updated by Peter Amstutz 7 months ago

  • Target version changed from 2022-08-31 sprint to 2022-09-14 sprint
Actions
Copy link
 #15

Updated by Peter Amstutz 7 months ago

  • Target version changed from 2022-09-14 sprint to 2022-09-28 sprint
Actions
Copy link
 #16

Updated by Peter Amstutz 6 months ago

  • Target version changed from 2022-09-28 sprint to 2022-10-12 sprint
Actions
Copy link
 #17

Updated by Peter Amstutz 6 months ago

  • Target version changed from 2022-10-12 sprint to 2022-10-26 sprint
Actions
Copy link
 #18

Updated by Peter Amstutz 5 months ago

  • Target version changed from 2022-10-26 sprint to 2022-11-09 sprint
Actions
Copy link
 #19

Updated by Peter Amstutz 5 months ago

  • Target version changed from 2022-11-09 sprint to 2022-11-23 sprint
Actions
Copy link
 #20

Updated by Peter Amstutz 5 months ago

  • Target version changed from 2022-11-23 sprint to 2022-12-07 Sprint
Actions
Copy link
 #21

Updated by Peter Amstutz 4 months ago

  • Target version changed from 2022-12-07 Sprint to 2022-12-21 Sprint
Actions
Copy link
 #22

Updated by Peter Amstutz 4 months ago

  • Target version changed from 2022-12-21 Sprint to 2023-01-18 sprint
Actions
Copy link
 #23

Updated by Peter Amstutz 4 months ago

  • Target version changed from 2023-01-18 sprint to 2023-02-01 sprint
Actions
Copy link
 #24

Updated by Peter Amstutz 4 months ago

  • Target version changed from 2023-02-01 sprint to 2023-02-15 sprint
Actions
Copy link
 #25

Updated by Peter Amstutz 3 months ago

  • Target version changed from 2023-02-15 sprint to 2023-02-01 sprint
Actions
Copy link
 #26

Updated by Peter Amstutz 2 months ago

  • Target version changed from 2023-02-01 sprint to To be groomed
Actions
Copy link
 #27

Updated by Lucas Di Pentima about 2 months ago

  • Assigned To set to Lucas Di Pentima
Actions
Copy link
 #28

Updated by Lucas Di Pentima 11 days ago

  • Story points set to 1.0

The most potentially complex task in my eyes would be the repository merge, but it seems it's totally doable. This SO question has some clues about how to do it:

https://stackoverflow.com/questions/1425892/how-do-you-merge-two-git-repositories

In the past we talked about using the wb2 repo as a submodule of the arvados repo, but I think it would be more useful in this case to just merge it like explained in this answer:

https://stackoverflow.com/a/10548919

...the feature explained here seemingly allows keeping both histories.

So with that out of the way, I think it would take a full point to update the build scripts, CI pipelines, and so on.

Actions
Copy link

Also available in: Atom PDF