Support for pushing initial code that doesn't pass CLA git hook

Summary

Pushing the initial git code to an Eclipse project (oniro repository) fails on the CLA git hook. This is because history contains contributions from authors that haven't signed an Eclipse CLA. The issue is regarding the people who are not in the team anymore but their contributions are still in the existing git repository.

Steps to reproduce

Push the dunfell branch from https://booting.oniroproject.org/distro/oniro/ to the Eclipse repository available at https://gitlab.eclipse.org/eclipse/oniro-core/oniro.

What is the current bug behaviour?

git push fails.

What is the expected correct behaviour?

We are looking for a way to bypass the check for the initial code contribution. Subsequent contributions will adhere to the CLA requirements.

mentioned in issue eclipsefdn/emo-team/emo#168 (closed)

added ECA ~16083 labels

assigned to @webmaster

@idlethread

@agherzan Can we synchronize on a time for you to do this? The ECA is a global configuration, so we can only disable it for short amounts of time. I'm in the Eastern time zone (GMT-5)

Hi @droy. Sure, would 10am your time today work?

@droy you mention that this is a global configuration hence needing to handle this disable manually. If that is the case, what is the process of handling 3rd party code/forks that we would push both initially and regularly - to sync with upstream? Would we need to disable the check manually and temporary with every 3rd party fork pull/push?

10am works.

As for third party, you would not migrate the repo and its entire history to Gitlab, right? @wbeaton can explain more how Eclipse projects handle 3rd party dependencies.

@droy I'm available. We can also postpone it for 1-2 hours if it fits your schedule better.

@agherzan Hook has been moved aside.

Still get the error: remote: GitLab: Author 'ABC' is not a member of team.

There must be a permission setting on the repo and/or group. Looking.

I reckon it is Check whether the commit author is a GitLab user. Trying without it.

Try now?

It worked and I have restored the setting I've disabled at the level of the project. Am I correct to assume that it is a requirement to do so?

Yup.

ECA check is back in place. I think we're done here?

For the scope of the oniro repository yes. The issue now is about the linux and linux-meta repositories which are also part of the project proposal but are 3rd party code/forks. Could we push them as well?

For those I'd prefer @wbeaton comment.

In that case @droy I'll wait for him to weigh in.

EDIT: Thanks for your support.

@agherzan we know need to go back to checkin the repository, just as you did some days ago, through the CQ.

So we go back to /eclipsefdn/emo-team/emo/#168 (moved)

@toscalix That's what I've done with Denis above. I've pushed the initial code to the repository hence checking it in. Is there something I'm missing?

As for third party, you would not migrate the repo and its entire history to Gitlab, right? @wbeaton can explain more how Eclipse projects handle 3rd party dependencies.

What they're doing may require a longer conversation. What the Oniro team needs to do is similar to what our Eclipse Temurin friends are doing with the OpenJDK. That is, they need to have a means of maintaining clones of third party content to work on forks that they will push upstream. I'll add a background discussion of this to our weekly meeting.

That is exactly the case @wbeaton. These two forks were included as the initial repositories for this project -linux and linux-meta. There are a set of additional ones that we will want to migrate in the very near future so I'd be very happy if we could clarify the process that needs to be followed.

mentioned in issue #1067 (closed)

added to epic &12 (closed)

mentioned in epic &12 (closed)

mentioned in issue #1525 (closed)

I'd like to get the same done for a few repos (or the entire project) in https://gitlab.eclipse.org/eclipse/oniro-blueprints as we migrate blueprint repos over from booting.oniroproject.org.

Specifically: https://gitlab.eclipse.org/eclipse/oniro-blueprints/doorlock/doorlock-factoryreset https://gitlab.eclipse.org/eclipse/oniro-blueprints/doorlock/doorlock-zephyr https://gitlab.eclipse.org/eclipse/oniro-blueprints/vending-machine/vending-machine-control-application https://gitlab.eclipse.org/eclipse/oniro-blueprints/vending-machine/vending-machine-ui-application

There may be more within https://gitlab.eclipse.org/eclipse/oniro-blueprints/transparent-gateway so it may be best to just turn it off for today if possible for the entire oniro-blueprints project while this migration occurs.

mentioned in issue #1588 (closed)

As noted this is a global setting for Gitlab, so we can't disable it just for Oniro. And disabling this instance wide for a day isn't something our processes will allow.

I think the best path forward would be to coordinate a series of times where we can disable the CLA check for a short period(1h-ish) and the project team can push the initial commit.

@mward @pidge Can we synchronise on a slot like that to do this sometime this week?

Sure. @mward when is the least disruptive for you in the next day or so?

Our Webdev team came up with a solution to exempt just the above repos based on some other work they've done for Oniro. That change is now live so you should be able to push the initial commits without issue.

Please let us know when your done as I'd like to get things reverted as quickly as I can.

@mward Thank you. This seems to be not turned off for https://gitlab.eclipse.org/eclipse/oniro-blueprints/doorlock/doorlock-zephyr Everything else was pushed fine however, so once this repo is turned off and I push we can close this.

Oniro-blueprints/doorlock/doorlock-zephyr was part of the update yesterday, so the CLA validation should already be suspended for that repo.

@mward That's odd then, as I'm getting the same error I was getting on the check.

Enumerating objects: 88, done.
Counting objects: 100% (88/88), done.
Delta compression using up to 20 threads
Compressing objects: 100% (51/51), done.
Writing objects: 100% (88/88), 22.88 KiB | 22.88 MiB/s, done.
Total 88 (delta 36), reused 88 (delta 36)
remote: GL-HOOK-ERR: Unable to validate commit, server error encountered.
remote: 
remote: Please contact the administrator, and retry the commit at a later time.
remote: 
To gitlab.eclipse.org:eclipse/oniro-blueprints/doorlock-zephyr.git
 ! [remote rejected] main -> main (pre-receive hook declined)
error: failed to push some refs to 'git@gitlab.eclipse.org:eclipse/oniro-blueprints/doorlock-zephyr.git'

History wise, nothing is jumping out at me here as being an issue.

https://booting.oniroproject.org/distro/blueprints/doorlock/doorlock-zephyr/-/commits/main

Um, shouldn't the push be to "eclipse/oniro-blueprints/doorlock/doorlock-zephyr" and not "eclipse/oniro-blueprints/doorlock-zephyr"(as reported by your commit error)?

AH, ty, was a problem with my scripts. We can turn ECA on again for these repos, ty!

Done.

closed