Migrate (move) CHESS repo to Gitlab

To avoid problems with multiple repos, shouldn't be possible to have GitLab referring to the source repo, rather than to the copied ones.

E.g. CHESS GitLab repo could refer to https://git.eclipse.org/c/chess/chess.git/ and not to https://gitlab.eclipse.org/eclipse/chess/chess.git.

@droy Do you think it is feasible?

I'm not sure if we're on the same page as to what Gitlab is. Gitlab is an independent system, alternative to git.eclipse.org and Gerrit. For those projects that migrate, we'd expect to (eventually, but soon after) delete the repository on git.eclipse.org/c/...

OK! Now we are still working on the git.eclipse.org repository. Before the deletion of the repository the GitLab repo has to be updated.

Another question: Can we still use existing Jenkins jobs on the GitLab repository or we can only use the CI of GitLab?

Let me know when you want to cut over the repo from git.eclipse.org to GitLab. I would then delete the repo on Gitlab, then reimport it from git.eclipse.org and mark it as read-only.

You can continue to use Jenkins, we have no immediate plans for Gitlab's CI.

@droy We would like to cut over the repo from git.eclipse.org to GitLab. As you suggested, it would be preferred to keep git.eclipse.org and mark it as read-only.

Thanks Denis.

@cguindon, @epoirier, @fgurr, @malowe, @webmaster, may I ask your help?

changed title from make reference to original Eclipse repo. to Migrate (move) CHESS repo to Gitlab

added Migration label

mentioned in issue eclipse/chess/chess#6 (closed)

Hi Alberto, please confirm: Can we do that at any time?

Also: We have a process for importing Open (not closed) Bugzilla bugs into Gitlab (see https://gitlab.eclipse.org/eclipsefdn/gitlab/-/issues/3). Would you be willing to try that too? If so, are you interested in also migrating closed bugs (if possible) ?

Hi Denis, I'm working on a branch in CHESS, but I don't think this is a problem right? I confirm that we are ready for the migration.

We are interested also in the migration of open and closed bugs. Could you give me support on this?

I think our best bet is to delete the Git repo on Gitlab, reimport it fresh from git.eclipse.org, mark that one read-only and be done.

For bugs -- I need to see how the code needs to be morphed for closed bugs. Stay tuned.

I think our best bet is to delete the Git repo on Gitlab, reimport it fresh from git.eclipse.org, mark that one read-only and be done.

If you agree, please let me know when I can perform those tasks.

You can perform such tasks.

Question: In the jobs of Jenkins, the current url is: ssh://genie.chess@git.eclipse.org:29418/chess/chess. How will it change? The genie credentials will remain the same?

Thanks.

The CHESS repo has been reimported, and marked as read-only. I've also updated the descrption here: https://git.eclipse.org/r/admin/repos/chess/chess

@cguindon @fgurr How can we get the genie accounts into Gitlab? If we have passwords, we can just "log in" manually but it would be nice to do this automatically.

The issues in GitLab CHESS are now empty, probably due to the re-import. It there a way to restore the issues?

Unfortunately not. My apologies - I did not think that deleting the repo would delete the issues, but thinking back, this makes sense, as Gitlab considers it a project.

Again, apologies for the lost data.

@droy We can add users via the Gitlab API. In fact, the sync script already does that.

I thinking we could add some info to the https://api.eclipse.org/bots endpoint to identify accounts that we need to import in gitlab!

Is this simply a question of adding new users to Gitlab or do we also need to add a public ssh key to the account?

@cguindon perhaps @fgurr can help answer the question about keys. Since the CI system needs to log into Gitlab to write data, I would suspect keys are needed.

Yes, pushing to Gitlab requires a public SSH key (at least for the bot accounts).

After the CHESS migration, when a Merge Request is created, it starts from the master. Is it possible to re-set the default source to "devel" instead of "master"? (https://gitlab.eclipse.org/eclipsefdn/gitlab/-/issues/4#note_86)

Do you want the default branch to be "devel"? Or just for merge requests (if that's even possible)?

We use the "devel" branch for internal development. We keep the "master" only for the official release. The common use case is that the developer creates a MR from the "devel" branch. When we want to release an official version of CHESS, the "devel" branch is merged into the "master".

I don't know the implications to have the "devel" branch as default branch.

@droy did you set the default branch to "devel"? (before you posted https://gitlab.eclipse.org/eclipsefdn/gitlab/-/issues/4#note_105)

Good catch, I reset the default branch to devel.

I have problems executing jobs of Jenkins. I changed the remote repository of this job, from "git://git.eclipse.org/gitroot/chess/chess.git" to "git://gitlab.eclipse.org:eclipse/chess/chess.git" .

If you are not pushing commits to the repo during a build, you can use https://gitlab.eclipse.org/eclipse/chess/chess.git. If you are planning to push commits to the GitLab repo, let us know and we will set up SSH credentials.

For other jobs I push new commits, e.g. I merge a specific branch into the branch "devel".

I'm not able to create a new Merge Request

I can reproduce this error, when clicking on the "create merge request" button.

I have problems also creating new branches. I think the two problems are related.

For other jobs I push new commits, e.g. I merge a specific branch into the branch "devel".

I've set up a Chess GitLab bot user and a SSH key. The SSH credentials have also been added to the Chess Jenkins instance (credentials ID: gitlab-bot-ssh). Please test, if pushing commits works as expected. If it does not work, please create a new dedicated GitLab issue for it.

I created the issue https://gitlab.eclipse.org/eclipsefdn/gitlab/-/issues/11.

I found this issue over at Gitlab, and a possible workaround. The issue is still open.

https://gitlab.com/gitlab-org/gitlab-foss/-/issues/28866#note_40336332

@adebiasi please let me know if that helps.

If I understood correctly, the workaround suggests to create branches, but I'm not able to do it. I tried using GitLab (https://gitlab.eclipse.org/eclipsefdn/gitlab/-/issues/5#note_135) and also creating a branch locally and then trying to push it.

I started from scratch: I cloned the CHESS repo, then I created a new branch and push it. I received the following message:

git push origin test_branch
Total 0 (delta 0), reused 0 (delta 0)
remote: /opt/gitlab/embedded/lib/ruby/gems/2.6.0/gems/json-2.3.0/lib/json/common.rb:156:in `parse': 783: unexpected token at '{"author": {"name":"Alberto Debiasi","mail":"adebiasi@fbk.eu"},"committer":{"name":"Alberto Debiasi","mail":"adebiasi@fbk.eu"},"body":"Merge branch 'devel' of https://git.eclipse.org/r/chess/chess.git into devel  Conflicts:        org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml  Change-Id: I0bc884825719dba819a81d5b85cc060560e52b2a ","subject":"Merge branch 'devel' of https://git.eclipse.org/r/chess/chess.git into devel","hash":"a973eb803ed378ce843c434122cce10d04f39ea3", "parents":["bdc5ed15ebf1ea4b0c0b3166c9fddf3ff2c2da63", "121776d103025288222a391f0132516e4e919940"]} ' (MultiJson::ParseError)
remote:         from /opt/gitlab/embedded/lib/ruby/gems/2.6.0/gems/json-2.3.0/lib/json/common.rb:156:in `parse'
remote:         from /opt/gitlab/embedded/lib/ruby/gems/2.6.0/gems/multi_json-1.14.1/lib/multi_json/adapters/json_common.rb:14:in `load'
remote:         from /opt/gitlab/embedded/lib/ruby/gems/2.6.0/gems/multi_json-1.14.1/lib/multi_json/adapter.rb:21:in `load'
remote:         from /opt/gitlab/embedded/lib/ruby/gems/2.6.0/gems/multi_json-1.14.1/lib/multi_json.rb:122:in `load'
remote:         from /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/eca.rb:52:in `block in <main>'
remote:         from /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/eca.rb:44:in `each'
remote:         from /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/eca.rb:44:in `<main>'
remote: /opt/gitlab/embedded/lib/ruby/gems/2.6.0/gems/json-2.3.0/lib/json/common.rb:156:in `parse': 783: unexpected token at '{"author": {"name":"Alberto Debiasi","mail":"adebiasi@fbk.eu"},"committer":{"name":"Alberto Debiasi","mail":"adebiasi@fbk.eu"},"body":"Merge branch 'devel' of https://git.eclipse.org/r/chess/chess.git into devel  Conflicts:        org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml  Change-Id: I0bc884825719dba819a81d5b85cc060560e52b2a ","subject":"Merge branch 'devel' of https://git.eclipse.org/r/chess/chess.git into devel","hash":"a973eb803ed378ce843c434122cce10d04f39ea3", "parents":["bdc5ed15ebf1ea4b0c0b3166c9fddf3ff2c2da63", "121776d103025288222a391f0132516e4e919940"]} ' (JSON::ParserError)
remote:         from /opt/gitlab/embedded/lib/ruby/gems/2.6.0/gems/json-2.3.0/lib/json/common.rb:156:in `parse'
remote:         from /opt/gitlab/embedded/lib/ruby/gems/2.6.0/gems/multi_json-1.14.1/lib/multi_json/adapters/json_common.rb:14:in `load'
remote:         from /opt/gitlab/embedded/lib/ruby/gems/2.6.0/gems/multi_json-1.14.1/lib/multi_json/adapter.rb:21:in `load'
remote:         from /opt/gitlab/embedded/lib/ruby/gems/2.6.0/gems/multi_json-1.14.1/lib/multi_json.rb:122:in `load'
remote:         from /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/eca.rb:52:in `block in <main>'
remote:         from /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/eca.rb:44:in `each'
remote:         from /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/eca.rb:44:in `<main>'
To https://gitlab.eclipse.org/eclipse/chess/chess.git
 ! [remote rejected]   test_branch -> test_branch (pre-receive hook declined)
error: failed to push some refs to 'https://gitlab.eclipse.org/eclipse/chess/chess.git'

For us this is a critical issue since we are not able to create new branches.

We are investigating.

We have identified the issue and applying a fix.

We have successfully applied a fix for the JSON parsing error.

Unfortunately, we found another issue with the ECA check. It currently does not allow to push a commit or create a branch in the CHESS project, due to an old commit where the author is (no longer) a committer of the project and the signed-off part is missing. We are investigating.

Is there any news about this issue?

We've created a patch that address a couple of the issues encountered (just awaiting approval before we push to this instance). We won't check forks/non-project repos going forward to enable pushing to a fork no matter the state of the current branch. When pushing to a project repo, we compare to the default branch (devel in this case iirc) and check for commits not present in that branch. This should fix your issues with old unsigned commits! There are a couple of other minor issues we are looking to solve, but they should be non-blocking in this case

@adebiasi We've applied a patch that should unblock commits to forks fully, and should fix the issue where we were checking too many commits. Let us know if we've resolved the issue! :)

Thanks Martin. @adebiasi many thanks for being the Gitlab tester!

Now it's possible to create new branches. Thanks!

I think we are done here?

Yes from my side.

closed

reopened