Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 353368 - migration platform.resources to git
Summary: migration platform.resources to git
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Resources (show other bugs)
Version: 3.7   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: 3.8 M2   Edit
Assignee: Platform-Resources-Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 345479
  Show dependency tree
 
Reported: 2011-07-28 16:51 EDT by Kim Moir CLA
Modified: 2011-08-23 04:15 EDT (History)
9 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Kim Moir CLA 2011-07-28 16:51:53 EDT
The test repo is available here...

your_comitter_id@git.eclipse.org:/gitroot/platform/eclipse.platform.resources
Comment 1 Szymon Brandys CLA 2011-08-10 07:13:58 EDT
core.resources tests pass. I can commit to master and the history looks fine. Kim, could you spin a build using core.resources Git repo?
Comment 2 Szymon Brandys CLA 2011-08-10 07:24:31 EDT
Kim, is there anything else we should look at?
Comment 3 Kim Moir CLA 2011-08-10 08:43:29 EDT
Please update the map files for core.resources bundles in the git_test branch of org.eclipse.releng and I'll start a test build.
Comment 4 Szymon Brandys CLA 2011-08-10 09:26:32 EDT
Adding Andrew. He seems to know where are scripts to tag/release Git repos.
Comment 5 Szymon Brandys CLA 2011-08-10 10:08:23 EDT
We plan to make the final migration on Aug 18th (Thursday). I already asked committers on platform-core-dev to freeze commits this day.
Comment 6 Szymon Ptaszkiewicz CLA 2011-08-10 11:16:58 EDT
If I clone the repo, I always get CVSROOT folder in the main folder of the local cloned repository. Is it working as expected or something is wrong there?
Comment 7 Kim Moir CLA 2011-08-10 11:25:30 EDT
regarding comment #6

I will fix that when I run the real migration. Sorry about that.
Comment 8 Andrew Niefer CLA 2011-08-10 13:15:38 EDT
http://wiki.eclipse.org/E4/Git#Submitting_for_a_build contains instructions and links to scripts.

This still involves a number of manual steps, we need a proper UI releng tool, see bug 345668 and blockers
Comment 9 Kim Moir CLA 2011-08-10 13:20:20 EDT
Szymon, the git_test branch of org.eclipse.releng isn't updated.  You need to change the map files to refer to git instead of CVS for the bundles in the platform.resources repo

For example here is the osgi bundle
plugin@org.eclipse.osgi=GIT,tag=v20110808-1537,repo=git://git.eclipse.org/gitroot/equinox/rt.equinox.framework.git,path=bundles/org.eclipse.osgi
Comment 10 Szymon Brandys CLA 2011-08-11 05:52:32 EDT
Map files updated on the git_test branch.

Kim, I compared core.resources repo with core.runtime one. Could we group projects by types i.e. tests and bundles in the final repo?

The following projects are empty
org.eclipse.core.resources.hpux
org.eclipse.core.resources.linux
org.eclipse.core.resources.macosx
org.eclipse.core.resources.qnx
The functionality supplied by them has been moved to the org.eclipse.core.filesystem.* projects.

org.eclipse.core.resources.win32 is also empty. The fragment has been replaced by specific fragments for each
supported architecture:
org.eclipse.core.resources.win32.x86
org.eclipse.core.resources.win32.ia64

I see they were crossed out on http://wiki.eclipse.org/Platform-releng/Git_Migration_Granularity
As I see crossed out projects in SWT were not moved to Git.

Thanks.
Comment 11 Kim Moir CLA 2011-08-11 09:10:09 EDT
okay, I'll add subdirectories when I migrate them so there is a bundles and tests subdirectories. Also, I'll exclude the old bundles you mentioned.
Comment 12 James Blackburn CLA 2011-08-11 09:23:04 EDT
(In reply to comment #11)
>  Also, I'll exclude the old bundles you mentioned.

What do you mean by exclude? If the content was moved within the repo (without physically moving the ,v files), then you'll lose history without importing those directories.  If this is the case it would be better to delete the directories from master having done the conversion rather than exclude the directories altogether.
Comment 13 John Arthorne CLA 2011-08-11 14:54:51 EDT
(In reply to comment #12)
> What do you mean by exclude? If the content was moved within the repo (without
> physically moving the ,v files), then you'll lose history without importing
> those directories.  If this is the case it would be better to delete the
> directories from master having done the conversion rather than exclude the
> directories altogether.

Our conversion process involves creating a copy of the CVS repository, and then running the conversion on that copy. When we exclude bundles, we simply delete that entire subtree from the CVS copy before running the conversion tool. These fragments only contain binaries from old releases that will just bloat our Git repository.
Comment 14 Paul Webster CLA 2011-08-11 19:24:42 EDT
(In reply to comment #8)
> http://wiki.eclipse.org/E4/Git#Submitting_for_a_build contains instructions and
> links to scripts.
> 

Andrew, you have the best release scripts on build.eclipse.org.  Could you update the ones in the releng/org.eclipse.e4.builder/scripts directory to those?  You said you needed to make sure they worked with Orion too.

PW
Comment 15 Andrew Niefer CLA 2011-08-12 17:03:46 EDT
(In reply to comment #14)
> (In reply to comment #8)
> > http://wiki.eclipse.org/E4/Git#Submitting_for_a_build contains instructions and
> > links to scripts.
> > 
> 
> Andrew, you have the best release scripts on build.eclipse.org.  Could you
> update the ones in the releng/org.eclipse.e4.builder/scripts directory to
> those?  You said you needed to make sure they worked with Orion too.
> 
> PW

I have released new versions of these scripts and updated the wiki page with a new description of their use.
Comment 16 Kim Moir CLA 2011-08-18 10:44:16 EDT
ding ding

your repo is ready :-)

your_comitter_id@git.eclipse.org:/gitroot/platform/eclipse.platform.resources

I deleted my local repo within Eclipse and re-replicated just to be sure.

Let me know if you see any issues.  Also, please update the map files in HEAD to point to the git repository so I can run a test build.
Comment 17 John Arthorne CLA 2011-08-18 17:12:45 EDT
(In reply to comment #16)
> Let me know if you see any issues.  Also, please update the map files in HEAD
> to point to the git repository so I can run a test build.

I have updated core.map.
Comment 18 Kim Moir CLA 2011-08-18 17:19:37 EDT
Thanks John, test build has started here

https://hudson.eclipse.org/hudson/view/Eclipse%20and%20Equinox/job/eclipse-equinox-test-N/361/
Comment 19 Kim Moir CLA 2011-08-18 17:39:38 EDT
There was a typo in the maps which I fixed.

New test build here
https://hudson.eclipse.org/hudson/view/Eclipse%20and%20Equinox/job/eclipse-equinox-test-N/362/
Comment 20 Szymon Ptaszkiewicz CLA 2011-08-19 06:40:51 EDT
(In reply to comment #16)
> Let me know if you see any issues.

I cloned the repo and I saw the following project is also empty:
 - org.eclipse.core.filesystem.macosx.ppc
It is not crossed out on http://wiki.eclipse.org/Platform-releng/Git_Migration_Granularity so probably it should be crossed out and excluded from migration (if it is not too late for that).

There is also one nonempty project that is crossed out and was migrated to git:
 - org.eclipse.core.resources.win32.ia64
I think that this one should be just un-crossed out.
Comment 21 Szymon Brandys CLA 2011-08-19 07:11:38 EDT
(In reply to comment #20)
> I cloned the repo and I saw the following project is also empty:
> - org.eclipse.core.filesystem.macosx.ppc
> It is not crossed out on
> http://wiki.eclipse.org/Platform-releng/Git_Migration_Granularity so probably it
> should be crossed out and excluded from migration (if it is not too late for
> that).

The functionality was moved to org.eclipse.core.filesystem.macosx.

> There is also one nonempty project that is crossed out and was migrated to git:
> - org.eclipse.core.resources.win32.ia64
> I think that this one should be just un-crossed out.

See comment 10. This project should be in our Git repo. So it is just wrongly crossed out on the wiki. I fixed the wiki.
Comment 22 Kim Moir CLA 2011-08-19 09:54:49 EDT
So the repo is okay?

We were able to build these bundles from git for build N20110818-2000.  If you are happy with the conversion, please update the maps in the R3_7_maintenance stream as well to reflect the new git location.
Comment 23 Szymon Brandys CLA 2011-08-23 03:41:22 EDT
(In reply to comment #22)
> So the repo is okay?

Yes. We just need to delete later one empty bundle mentioned by Szymon P.

> We were able to build these bundles from git for build N20110818-2000.  If you
> are happy with the conversion, please update the maps in the R3_7_maintenance
> stream as well to reflect the new git location.

The map in the R3_7_maintenance stream is updated. According to Kim we may close the bug now.
Thanks Kim!
Comment 24 James Blackburn CLA 2011-08-23 04:15:43 EDT
This is very cool, thanks all!