Migrate from submodules to subrepos

[varac]

We decided to move away from git submodules towards the more user-friendly git-subrepos.

Please see #44 for more details.

[deniscostadsc]

Can we split this issue for each repository that has submodules?

[varac]

Hej @deniscostadsc

i'm fine with splitting to made things quick here the list of repos:

• [ ] leap_platform (varac)
• [x] pixelated-platform-environments

i can't think of anything else... you ?

[cz8s]

I started a wiki: https://github.com/pixelated/project-issues/wiki/git-subrepos

[cz8s]

Migrated platform-environments to subrepos. That was easy:

git subrepo clone https://github.com/pixelated/puppet-pixelated.git pixelated-project.org/files/puppet/modules/pixelated
git subrepo clone https://github.com/pixelated/puppet-pixelated.git wazokazi.is/files/puppet/modules/pixelated
git subrepo clone https://github.com/pixelated/leap_platform.git leap_platform -b develop
git push

[cz8s]

for leap_platform we just have to wait for leap, right?

[re-nobre]

During the deploy to prodution, I checked and all the files are there. It was strange because I needed to make a git reset --hard origin/master So we think it will be good if someone else try one more time. :)

[cz8s]

I have a problem with our platform-environment repo now. I can't pull the latest changes from leap_platform:

~/code/tw/platform-environments ᐅ git subrepo pull leap_platform
git-subrepo: Can't find a common ancestor between refs/subrepo/leap_platform/fetch and subrepo/leap_platform. 
This might be the case if someone used push --force on the subrepo. You need to find out why and possibly reclone the subrepo.

But there was no force push. @varac: any ideas?

[cz8s]

I think this can't work: I just realized that leap needs the submodule under leap_platform inside that repo. So we now have leap_platform as a subrepo but leap_platform still needs the submodules in puppet/modules/. And we can't have both at the same time...

[cz8s]

And also https://leap.se/code/issues/8248

[cz8s]

I reset the repo to a state before the switch to submodules.

[cz8s]

I had to force push. sorry, but you might have to update your repo

[cz8s]

I think this can be closed until leap has migrated

[cz8s]

leap_platform now has subrepos. So we can do this again

[cz8s]

@varac migrated our platform-environments to subrepos. I deployed to dev and it works. I removed the branch pinning from provider.dev.json and provider.unstable.json because leap_platform does not have a branch anymore (its a subrepo)

Seems cool :)