Skip to content
Snippets Groups Projects

Add hotfix for oniro to replace known bad email

Merged Add hotfix for oniro to replace known bad email
(removed):malowe/master/oniro-hotfix into master
1 unresolved thread
Merged Martin Lowe requested to merge (removed):malowe/master/oniro-hotfix into master
1 unresolved thread

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Martin Lowe added 1 commit

    added 1 commit

    • 332b3886 - Update git diff command to use rev-list instead of cherry

    Compare with previous version

  • Martin Lowe
    Martin Lowe @malowe ·
    Author Maintainer

    Updating from cherry to rev-list with some additional logic seems to simplify the logic in the hook script, as well as fix issues with overzealous testing. @cguindon helped me figure out an easier testing methodology, as well as helped me find a fix for new branches that I had problems with when initially testing this solution.

    Process of testing:

    1. Checked out repo w/ branch that was not properly merging (https://gitlab.eclipse.org/agherzan/oniro/-/tree/dunfell4ef)
    2. Checked out a bare copy of the main repo (https://gitlab.eclipse.org/eclipse/oniro-core/oniro)
    3. Add my debug script as the pre-receive hook, see src/main/rb/debug.rb
    4. Set bare copy as remote in the normal repo
    5. Pushed the branch to the bare repo, observe the output
    6. Test output in a call to the real API

    Observed payload

    {
   "repoUrl":"",
   "provider":"gitlab",
   "commits":[
      {
         "author":{
            "name":"Chase Qi",
            "mail":"chase.qi@linaro.org"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":"ci: use string @var@ instead of $var for lava job templateThis helps to understand that the actual interpolation process cannot usesyntax like bash/sh. In addition, putting the @ sigil at both ends so that@FOO_BAR is not incorrectly replaced as well.Signed-off-by: Chase Qi <chase.qi@linaro.org>",
         "subject":"ci: use string @var@ instead of $var for lava job template",
         "hash":"62f546028144246a3f5e7694b923f081c7de4679",
         "parents":[
            "5244dbdf20b29c0e3a5075742ef44c2135543ec0"
         ]
      },
      {
         "author":{
            "name":"Chase Qi",
            "mail":"chase.qi@linaro.org"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":"ci: enable ltp testing on linux buildsSigned-off-by: Chase Qi <chase.qi@linaro.org>",
         "subject":"ci: enable ltp testing on linux builds",
         "hash":"5244dbdf20b29c0e3a5075742ef44c2135543ec0",
         "parents":[
            "f0e592240653b471ca347e92a8c1c01fdbac26bb"
         ]
      },
      {
         "author":{
            "name":"Chase Qi",
            "mail":"chase.qi@linaro.org"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":"ci: only run lava-test and lava-report job for scheduled pipelineSet lava-test and lava-report job as scheduled pipeline only for thebelow reasons.* lava-test requires token set using GitLab variable for job submission* lava-report depends on all test jobsSigned-off-by: Chase Qi <chase.qi@linaro.org>",
         "subject":"ci: only run lava-test and lava-report job for scheduled pipeline",
         "hash":"f0e592240653b471ca347e92a8c1c01fdbac26bb",
         "parents":[
            "5d49981e8aa774b1fa4627880a8542a60943cf79"
         ]
      },
      {
         "author":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":"default.xml: Use .git extension for seco projectsThis avoids redirection warnings on fetch.Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>",
         "subject":"default.xml: Use .git extension for seco projects",
         "hash":"5d49981e8aa774b1fa4627880a8542a60943cf79",
         "parents":[
            "362e4f870330eb5302866b4a838f88cfb0a20f8b"
         ]
      },
      {
         "author":{
            "name":"Zygmunt Krynicki",
            "mail":"zygmunt.krynicki@huawei.com"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":".oniro-ci: use CI_ONIRO_RUNNER_PERSISTENT_STORAGEAs defined on https://booting.oniroproject.org/distro/infra/Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>",
         "subject":".oniro-ci: use CI_ONIRO_RUNNER_PERSISTENT_STORAGE",
         "hash":"362e4f870330eb5302866b4a838f88cfb0a20f8b",
         "parents":[
            "c8a99868da89993a968074f3a116e2b41805613b"
         ]
      },
      {
         "author":{
            "name":"Zygmunt Krynicki",
            "mail":"zygmunt.krynicki@huawei.com"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":".oniro-ci: drop the compliance tag from REUSE checkHistorically the REUSE check was routed to a dedicated but slow machinethat guaranteed that no CI would be stuck waiting on the minisculecompliance job.With the Eclipse migration and CI/CD being slightly out of our control,it's just more convenient to drip this tag rather than requestconfiguration change in the instance.Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>",
         "subject":".oniro-ci: drop the compliance tag from REUSE check",
         "hash":"c8a99868da89993a968074f3a116e2b41805613b",
         "parents":[
            "a4eca271945800e3bf917f9042eb8ee4f78e326e"
         ]
      },
      {
         "author":{
            "name":"Zygmunt Krynicki",
            "mail":"zygmunt.krynicki@huawei.com"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":".oniro-ci: drop the compliance tag from DCO checkHistorically the DCO check was routed to a dedicated but slow machinethat guaranteed that no CI would be stuck waiting on the minisculecompliance job.With the Eclipse migration and CI/CD being slightly out of our control,it's just more convenient to drip this tag rather than requestconfiguration change in the instance.Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>",
         "subject":".oniro-ci: drop the compliance tag from DCO check",
         "hash":"a4eca271945800e3bf917f9042eb8ee4f78e326e",
         "parents":[
            "bfddda9957553b907783d55b4fa4d7d33a32d6b1"
         ]
      },
      {
         "author":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":"ci: Adapt structure/paths/repos after EF migrationIn the EF GitLab, all Oniro repositories are available athttps://gitlab.eclipse.org/eclipse/oniro-core.For example:`oniro` -> https://gitlab.eclipse.org/eclipse/oniro-core/distro`docs` -> https://gitlab.eclipse.org/eclipse/oniro-core/docsThis change addresses these migrations and the associated structurechanges.Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>",
         "subject":"ci: Adapt structure/paths/repos after EF migration",
         "hash":"bfddda9957553b907783d55b4fa4d7d33a32d6b1",
         "parents":[
            "30878213e4d685e486c3ae2d6aa39d72f5e2597f"
         ]
      },
      {
         "author":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":"ci: Use the OSTC registry for all container imagesThe EF infrastructure (GitLab) doesn't support image registry. Thischange switches the container images to use the OSTC registry while EFcatches up[1].[1] https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/1108Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>",
         "subject":"ci: Use the OSTC registry for all container images",
         "hash":"30878213e4d685e486c3ae2d6aa39d72f5e2597f",
         "parents":[
            "56fb73c3bf5b52008f419ed63627bf7faa800393"
         ]
      },
      {
         "author":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":"default.xml: Restructure and adapt for EF migrationA set of changes are included:* define and use the `eclipse` remote for all the repositories migrated  to Eclipse Foundation infrastructure* rename the `oniro` remote to `oniro-booting` and use it for the only  repository left there: ip-policy* drop the default remote/revision configuration - having them explicit  makes the project configuration less confusing* use .git extension for the GitLab repositories to avoid fetch redirect  warningSigned-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>",
         "subject":"default.xml: Restructure and adapt for EF migration",
         "hash":"56fb73c3bf5b52008f419ed63627bf7faa800393",
         "parents":[
            "24b17946844ef14f03e1eaed6521ec0b3352de2f"
         ]
      },
      {
         "author":{
            "name":"Zygmunt Krynicki",
            "mail":"zygmunt.krynicki@huawei.com"
         },
         "committer":{
            "name":"Andrei Gherzan",
            "mail":"andrei.gherzan@huawei.com"
         },
         "body":"manifests: fix tabs-vs-spaces for meta-zephyr-bspJust making it tidy ahead of other changes.Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>",
         "subject":"manifests: fix tabs-vs-spaces for meta-zephyr-bsp",
         "hash":"24b17946844ef14f03e1eaed6521ec0b3352de2f",
         "parents":[
            "d79daf1c20cbbf08f2c6bafcbe4516e6d90348c4"
         ]
      }
   ]
}

    Response from server:

    {
	"passed": true,
	"errorCount": 0,
	"time": 1649438498428,
	"commits": {
		"56fb73c3bf5b52008f419ed63627bf7faa800393": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: 56fb73c3bf5b52008f419ed63627bf7faa800393"
				},
				{
					"code": 200,
					"message": "Authored by: Andrei Gherzan <andrei.gherzan@huawei.com>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(author) is a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		},
		"5244dbdf20b29c0e3a5075742ef44c2135543ec0": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: 5244dbdf20b29c0e3a5075742ef44c2135543ec0"
				},
				{
					"code": 200,
					"message": "Authored by: Chase Qi <chase.qi@linaro.org>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'chaseqi'(author) is not a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'chaseqi'(author) has a current Eclipse Contributor Agreement (ECA) on file."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		},
		"30878213e4d685e486c3ae2d6aa39d72f5e2597f": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: 30878213e4d685e486c3ae2d6aa39d72f5e2597f"
				},
				{
					"code": 200,
					"message": "Authored by: Andrei Gherzan <andrei.gherzan@huawei.com>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(author) is a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		},
		"24b17946844ef14f03e1eaed6521ec0b3352de2f": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: 24b17946844ef14f03e1eaed6521ec0b3352de2f"
				},
				{
					"code": 200,
					"message": "Authored by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'zyga'(author) is a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		},
		"62f546028144246a3f5e7694b923f081c7de4679": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: 62f546028144246a3f5e7694b923f081c7de4679"
				},
				{
					"code": 200,
					"message": "Authored by: Chase Qi <chase.qi@linaro.org>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'chaseqi'(author) is not a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'chaseqi'(author) has a current Eclipse Contributor Agreement (ECA) on file."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		},
		"a4eca271945800e3bf917f9042eb8ee4f78e326e": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: a4eca271945800e3bf917f9042eb8ee4f78e326e"
				},
				{
					"code": 200,
					"message": "Authored by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'zyga'(author) is a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		},
		"bfddda9957553b907783d55b4fa4d7d33a32d6b1": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: bfddda9957553b907783d55b4fa4d7d33a32d6b1"
				},
				{
					"code": 200,
					"message": "Authored by: Andrei Gherzan <andrei.gherzan@huawei.com>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(author) is a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		},
		"f0e592240653b471ca347e92a8c1c01fdbac26bb": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: f0e592240653b471ca347e92a8c1c01fdbac26bb"
				},
				{
					"code": 200,
					"message": "Authored by: Chase Qi <chase.qi@linaro.org>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'chaseqi'(author) is not a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'chaseqi'(author) has a current Eclipse Contributor Agreement (ECA) on file."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		},
		"362e4f870330eb5302866b4a838f88cfb0a20f8b": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: 362e4f870330eb5302866b4a838f88cfb0a20f8b"
				},
				{
					"code": 200,
					"message": "Authored by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'zyga'(author) is a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		},
		"c8a99868da89993a968074f3a116e2b41805613b": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: c8a99868da89993a968074f3a116e2b41805613b"
				},
				{
					"code": 200,
					"message": "Authored by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'zyga'(author) is a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		},
		"5d49981e8aa774b1fa4627880a8542a60943cf79": {
			"messages": [
				{
					"code": 200,
					"message": "Reviewing commit: 5d49981e8aa774b1fa4627880a8542a60943cf79"
				},
				{
					"code": 200,
					"message": "Authored by: Andrei Gherzan <andrei.gherzan@huawei.com>"
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(author) is a committer on the project."
				},
				{
					"code": 200,
					"message": "Eclipse user 'agherzan'(committer) is a committer on the project."
				}
			],
			"warnings": [],
			"errors": []
		}
	},
	"trackedProject": true,
	"strictMode": false
}
  • Martin Lowe marked this merge request as ready

    marked this merge request as ready

  • Martin Lowe requested review from @cguindon, @droy, and @fgurr

    requested review from @cguindon, @droy, and @fgurr

  • Martin Lowe mentioned in issue eclipsefdn/helpdesk#1067 (closed)

    mentioned in issue eclipsefdn/helpdesk#1067 (closed)

  • Martin Lowe added 1 commit

    added 1 commit

    • 544d9c18 - Fix bad variable used in one of the comparisons

    Compare with previous version

  • Martin Lowe added 1 commit

    added 1 commit

    • 544d9c18 - Fix bad variable used in one of the comparisons

    Compare with previous version

  • Martin Lowe added 1 commit

    added 1 commit

    • 544d9c18 - Fix bad variable used in one of the comparisons

    Compare with previous version

  • Eric Poirier approved this merge request

    approved this merge request

  • Martin Lowe mentioned in commit 16f132c7

    mentioned in commit 16f132c7

  • Martin Lowe merged

    merged

Please register or sign in to reply

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent