OSM Public Wiki - User contributions [en]

https://osm.etsi.org/wikipub/api.php?action=feedcontributions&feedformat=atom&user=Benalaya OSM Public Wiki - User contributions [en] 2026-05-10T18:16:20Z User contributions MediaWiki 1.39.1 https://osm.etsi.org/wikipub/index.php?title=Resolving_merge_conflicts&diff=1208 Resolving merge conflicts 2017-02-20T02:34:52Z

<p>Benalaya: </p> <hr /> <div><br /> In some cases it is possible to resolve merge conflicts issues using simple rebase triggered directly from the Gerrit UI. However, in other cases some choices and updates need be done to resolve the conflicts that cannot be done using the Gerrit UI.<br /> <br /> These are the steps to follow to resolve the conflict and update the commit on Gerrit so it can be merged.<br /> <br /> <br /> 1. Get the last code from the repository<br /> * git checkout master<br /> * git pull origin master<br /> <br /> <br /> 2. Create a new branch to work on the code with conflicts. You can use the review number and patchset as name.<br /> * git checkout -b <review-number>-<patchset><br /> <br /> <br /> 3. Pull the patch on the created branch. <br /> (To find the command to execute you can open the corresponding change page on Gerrit UI, click on download menu, then copy the "pull" command.)<br /> * git pull <url> <ref><br /> <br /> <br /> Note: The two previous steps could be simplified using [https://www.mediawiki.org/wiki/Gerrit/git-review git-review] tool. The following command takes as input the review number, it creates a local branch and pull the change on it automatically.<br /> * git review -d <review-number><br /> <br /> <br /> 4. Make a rebase of your branch against master<br /> * git rebase master<br /> <br /> <br /> 5. Fix all conflicts that cannot be resolved manually using your editor.<br /> <br /> 6. Add all updated files to the index.<br /> # git add <file> <br /> <br /> Note: You can use git-status to make sure that conflicts are solved<br /> * git status<br /> <br /> <br /> 7. Continue the rebase process using the following command<br /> * git rebase --continue<br /> <br /> <br /> 8. Submit your change back to the repository<br /> * git push origin HEAD:refs/for/master<br /> <br /> <br /> Note: If you are using git-review tool, the previous step could be done with the following command<br /> * git review <br /> <br /> <br /> 9. Go back to Gerrit UI. You will find the change waiting for review.</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Resolving_merge_conflicts&diff=1207 Resolving merge conflicts 2017-02-20T02:32:27Z

<p>Benalaya: </p> <hr /> <div><br /> To resolve problem of merge conflicts, in some cases it is enough to do a simple rebase using the Gerrit interface. However, in other cases some choices and updates need be done to resolve the conflicts using your editor that cannot be done using the Gerrit UI.<br /> <br /> These are the steps to follow to resolve the conflict and update the commit on Gerrit so it can be merged.<br /> <br /> <br /> 1. Get the last code from the repository<br /> * git checkout master<br /> * git pull origin master<br /> <br /> <br /> 2. Create a new branch to work on the code with conflicts. You can use the review number and patchset as name.<br /> * git checkout -b <review-number>-<patchset><br /> <br /> <br /> 3. Pull the patch on the created branch. <br /> (To find the command to execute you can open the corresponding change page on Gerrit UI, click on download menu, then copy the "pull" command.)<br /> * git pull <url> <ref><br /> <br /> <br /> Note: The two previous steps could be simplified using [https://www.mediawiki.org/wiki/Gerrit/git-review git-review] tool. The following command takes as input the review number, it creates a local branch and pull the change on it automatically.<br /> * git review -d <review-number><br /> <br /> <br /> 4. Make a rebase of your branch against master<br /> * git rebase master<br /> <br /> <br /> 5. Fix all conflicts that cannot be resolved manually using your editor.<br /> <br /> 6. Add all updated files to the index.<br /> # git add <file> <br /> <br /> Note: You can use git-status to make sure that conflicts are solved<br /> * git status<br /> <br /> <br /> 7. Continue the rebase process using the following command<br /> * git rebase --continue<br /> <br /> <br /> 8. Submit your change back to the repository<br /> * git push origin HEAD:refs/for/master<br /> <br /> <br /> Note: If you are using git-review tool, the previous step could be done with the following command<br /> * git review <br /> <br /> <br /> 9. Go back to Gerrit UI. You will find the change waiting for review.</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Resolving_merge_conflicts&diff=1206 Resolving merge conflicts 2017-02-20T02:32:18Z

<p>Benalaya: </p> <hr /> <div><br /> To resolve problem of merge conflicts, in some cases it is enough to do a simple rebase using the Gerrit interface. However, in other cases some choices and updates need be done to resolve the conflicts using your editor that cannot be done using the Gerrit UI.<br /> <br /> <br /> These are the steps to follow to resolve the conflict and update the commit on Gerrit so it can be merged.<br /> <br /> <br /> 1. Get the last code from the repository<br /> * git checkout master<br /> * git pull origin master<br /> <br /> <br /> 2. Create a new branch to work on the code with conflicts. You can use the review number and patchset as name.<br /> * git checkout -b <review-number>-<patchset><br /> <br /> <br /> 3. Pull the patch on the created branch. <br /> (To find the command to execute you can open the corresponding change page on Gerrit UI, click on download menu, then copy the "pull" command.)<br /> * git pull <url> <ref><br /> <br /> <br /> Note: The two previous steps could be simplified using [https://www.mediawiki.org/wiki/Gerrit/git-review git-review] tool. The following command takes as input the review number, it creates a local branch and pull the change on it automatically.<br /> * git review -d <review-number><br /> <br /> <br /> 4. Make a rebase of your branch against master<br /> * git rebase master<br /> <br /> <br /> 5. Fix all conflicts that cannot be resolved manually using your editor.<br /> <br /> 6. Add all updated files to the index.<br /> # git add <file> <br /> <br /> Note: You can use git-status to make sure that conflicts are solved<br /> * git status<br /> <br /> <br /> 7. Continue the rebase process using the following command<br /> * git rebase --continue<br /> <br /> <br /> 8. Submit your change back to the repository<br /> * git push origin HEAD:refs/for/master<br /> <br /> <br /> Note: If you are using git-review tool, the previous step could be done with the following command<br /> * git review <br /> <br /> <br /> 9. Go back to Gerrit UI. You will find the change waiting for review.</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Resolving_merge_conflicts&diff=1205 Resolving merge conflicts 2017-02-20T02:31:56Z

<p>Benalaya: Created page with " To resolve problem of merge conflicts, in some cases it is enough to do a simple rebase using the Gerrit interface. However, in other cases some choices and updates need be d..."</p> <hr /> <div><br /> To resolve problem of merge conflicts, in some cases it is enough to do a simple rebase using the Gerrit interface. However, in other cases some choices and updates need be done to resolve the conflicts using your editor that cannot be done using the Gerrit UI.<br /> <br /> These are the steps to follow to resolve the conflict and update the commit on Gerrit so it can be merged.<br /> <br /> 1. Get the last code from the repository<br /> * git checkout master<br /> * git pull origin master<br /> <br /> <br /> 2. Create a new branch to work on the code with conflicts. You can use the review number and patchset as name.<br /> * git checkout -b <review-number>-<patchset><br /> <br /> <br /> 3. Pull the patch on the created branch. <br /> (To find the command to execute you can open the corresponding change page on Gerrit UI, click on download menu, then copy the "pull" command.)<br /> * git pull <url> <ref><br /> <br /> <br /> Note: The two previous steps could be simplified using [https://www.mediawiki.org/wiki/Gerrit/git-review git-review] tool. The following command takes as input the review number, it creates a local branch and pull the change on it automatically.<br /> * git review -d <review-number><br /> <br /> <br /> 4. Make a rebase of your branch against master<br /> * git rebase master<br /> <br /> <br /> 5. Fix all conflicts that cannot be resolved manually using your editor.<br /> <br /> 6. Add all updated files to the index.<br /> # git add <file> <br /> <br /> Note: You can use git-status to make sure that conflicts are solved<br /> * git status<br /> <br /> <br /> 7. Continue the rebase process using the following command<br /> * git rebase --continue<br /> <br /> <br /> 8. Submit your change back to the repository<br /> * git push origin HEAD:refs/for/master<br /> <br /> <br /> Note: If you are using git-review tool, the previous step could be done with the following command<br /> * git review <br /> <br /> <br /> 9. Go back to Gerrit UI. You will find the change waiting for review.</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Workflow_with_OSM_tools&diff=986 Workflow with OSM tools 2016-11-07T12:01:07Z

<p>Benalaya: /* Clone your project */</p> <hr /> <div>__TOC__<br /> <br /> <br /> = Login to OSM portal =<br /> # Go to OSM portal: https://osm.etsi.org/<br /> # Login using your username and password<br /> <br /> '''Note:'''<br /> * If you are '''[[Participate|contributing on behalf of your company]]''', you should login with your '''ETSI Online Account (EOL)'''. <br /> ** If your company is not yet an '''[https://portal.etsi.org/TBSiteMap/OSM/ListofOSMMembers.aspx OSM Member or Participant]''', you can check here '''[https://osm.etsi.org/welcome/#join how to join OSM as an organization]'''<br /> ** If your company has '''already joined OSM but you do not have an EOL account''' yet, you can '''[http://webapp.etsi.org/createaccount/ request an EOL account]''' <br /> <br /> * If you are an '''individual contributor''', you can '''[https://osm.etsi.org/index2.php?page=page_register.php create your OSM account online]'''.<br /> <br /> If you need any help, contact us at [mailto:OSMsupport@etsi.org OSMsupport@etsi.org]<br /> <br /> = Report a bug on Bugzilla =<br /> # Go to the OSM Portal<br /> # Click on '''Bugzilla''' menu on the portal menu bar.<br /> # Click on "new" on Bugzilla menu bar.<br /> # Choose the product, e.g. "OSM".<br /> # Complete the bug form. If you know, choose the component, e.g OpenMANO, Riftware, UI, SO, etc.<br /> # Enter the bug summary, description, attachement, etc.<br /> # Click on the "Submit Bug" button to confirm.<br /> # A bug id is generated (e.g. Bug 6 -Small Error)<br /> <br /> = Clone your project =<br /> # Clone a '''git''' repository, for example: <pre> git clone https://osm.etsi.org/gerrit/osm/openmano.git </pre><br /> # Enter your username<br /> # Enter you password<br /> # It is recommended to install the Gerrit commit-msg hook for the cloned repository in order to automatically insert a Change-Id tag in commit messages. You can install it by entering the following command for openmano repository <pre> scp -p -P 29418 <username>@osm.etsi.org:hooks/commit-msg openmano/.git/hooks/ </pre> More information about the Gerrit commit-msg hook can be found here https://git.eclipse.org/r/Documentation/cmd-hook-commit-msg.html<br /> <br /> '''Note''': <br /> * You can find the project repository URL on '''[https://osm.etsi.org/gitweb/ Gitweb]''' or on '''[https://osm.etsi.org/gerrit/ Gerrit]'''<br /> ** On Gitweb<br /> **# Click on '''Gitweb''' menu on the portal menu bar.<br /> **# Select a product to see the available cloning URLs<br /> ** On Gerrit<br /> **# Click on '''Gerrit''' menu on the portal menu bar.<br /> **# Click on "Projects" menu on the Gerrit menu bar.<br /> **# Click on "List" menu.<br /> **# Select a product to see the available cloning URLs.<br /> *It is recommended to install the <br /> <pre>scp -p -P 29418 benalaya@osm.etsi.org:hooks/commit-msg openmano/.git/hooks/</pre><br /> <br /> = Configure your Git environment =<br /> # Configure your git username globally: <pre> git config --global user.name <username> </pre><br /> # Configure your git email address: <pre> git config --global user.email <email> </pre><br /> # Check your git configuration: <pre> git config --list </pre><br /> '''Note: Your email address will be visible on commits to Git. <br /> If you'd like to keep your email address private, you can mask your email as follows:<br /> if your email is <name@company.com> you can set user.email to <hidden@company.com><br /> This allows other users to identify you as a contributor (with your user name) and<br /> Git Stats to keep track of your company's contributions (with the email domain)<br /> <br /> In case you are using git in the same computer for other open source projects, you can restrict your git variables to the local folder: <pre>git config --local user.name <username><br /> git config --local user.email <email> </pre><br /> <br /> = Commit changes to your local project =<br /> # go to the "openmano" folder <pre>cd osm/openmano</pre><br /> # Make some changes on the source (e.g. add a line to the "example-file")<br /> # Stage the change. <pre> git add example-file </pre> <br /> # Commit the change to your local repository. You can add a bug id in your commit message to link the bug to your contribution <pre> git commit -s -m "Bug 2 fixed!!" </pre> <br /> # You can see your commit message and update it, if needed, using the following command: <pre>git commit --amend </pre><br /> <br /> ==Developer's Certificate of Origin== <br /> * The "-s" parameter enables to Sign the contribution. It adds the following line at the end of your commit message: <br /> <pre> Signed-off-by: Random J Developer <random@developer.example.org></pre><br /> <br /> * The sign-off is a simple line at the end of the explanation for the patch, which certifies that you wrote it or otherwise have the right to pass it on as a open-source patch. The rules are pretty simple: signing a contribution means that you can certify the below: <br /> <br /> <pre><br /> Developer's Certificate of Origin 1.1<br /> <br /> By making a contribution to this project, I certify that:<br /> <br /> (a) The contribution was created in whole or in part by me and I<br /> have the right to submit it under the open source license<br /> indicated in the file; or<br /> <br /> (b) The contribution is based upon previous work that, to the best<br /> of my knowledge, is covered under an appropriate open source<br /> license and I have the right under that license to submit that<br /> work with modifications, whether created in whole or in part<br /> by me, under the same open source license (unless I am<br /> permitted to submit under a different license), as indicated<br /> in the file; or<br /> <br /> (c) The contribution was provided directly to me by some other<br /> person who certified (a), (b) or (c) and I have not modified<br /> it.<br /> <br /> (d) I understand and agree that this project and the contribution<br /> are public and that a record of the contribution (including all<br /> personal information I submit with it, including my sign-off) is<br /> maintained indefinitely and may be redistributed consistent with<br /> this project or the open source license(s) involved.<br /> </pre><br /> <br /> = Push your contribution to Gerrit =<br /> # To avoid merge conflicts, it is recommended to do a pull with rebase before pushing your contribution in order to merge latest changes made by other users. <pre>git pull --rebase</pre> Note: you can force git to use always the --rebase option with <pre>git config --local pull.rebase true</pre><br /> # Push your commits to '''Gerrit''' for Code Review using the following command <pre>git push origin HEAD:refs/for/master</pre> <pre>#use 'v1.0' instead of 'master' for contributing to v1.0 branch </pre> <br /> <pre> NOTE: you can also configure git to push always to the desired branch.<br /> git config --local remote.origin.push HEAD:refs/for/master<br /> git config --local remote.origin.push HEAD:refs/for/v1.0<br /> </pre><br /> # Enter your username.<br /> # Enter your password.<br /> # You can review your contribution on '''Gerrit''' web interface<br /> <br /> '''Notes:'''<br /> * The following actions are execution automatically after pushing any contribution to Gerrit: <br /> ** '''Gerrit''' reports the new contribution state to the corresponding bug in '''Bugzilla'''<br /> ** '''Gerrit''' notifies '''Jenkins''' to build the new contribution.<br /> <br /> = Gerrit Notifications =<br /> Gerrit sends email notifications to:<br /> *Owner of the change<br /> *Reviewers of the change<br /> *Project watchers <br /> <br /> Each user can configure his own watched projects and branches in the "settings/watched project" menu. Email notifications can be sent for New Changes, New Patch Sets, All Comments, Submitted Changes and Abandoned Changes.<br /> <br /> Link: [https://osm.etsi.org/gerrit/#/settings/projects https://osm.etsi.org/gerrit/#/settings/projects] (you can navigate there from the Gerrit console by clicking on the arrow by your login on the top right corner)<br /> <br /> = Continuous Integration =<br /> # '''Jenkins''' builds, tests the new contribution, and reports the result on its web interface.<br /> # '''Jenkins''' votes on the contribution using '''“Code-Verif”''' (-1, +1) on '''Gerrit'''.<br /> <br /> <br /> = Code Review =<br /> # Other '''contributors''' and '''MDG Committers''' can comment the new contribution and vote using '''“Code-Review”''' (-1, 0, +1) on '''Gerrit'''.<br /> # The '''MDG Leader''' can comment the new contribution and votes using '''“Code-Review”''' (-2, -1, 0, +1, +2) on '''Gerrit'''.<br /> <br /> <br /> = Merge the contribution =<br /> # The '''MDG Leader''' can "Submit" the change only if +1 '''"Code-Verif"''' (from '''Jenkins''') and at least one +2 '''"Code-Review"'''.<br /> # '''Gerrit''' reports the result of the code review to the corresponding bug in '''Bugzilla'''<br /> <br /> {{Feedback}}</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Workflow_with_OSM_tools&diff=680 Workflow with OSM tools 2016-07-18T20:20:25Z

<p>Benalaya: /* Clone your project */</p> <hr /> <div>__TOC__<br /> <br /> <br /> = Login to OSM portal =<br /> # Go to OSM portal: https://osm.etsi.org/<br /> # Login using your username and password<br /> <br /> '''Note:'''<br /> * If you are '''[[Participate|contributing on behalf of your company]]''', you should login with your '''ETSI Online Account (EOL)'''. <br /> ** If your company is not yet an '''[https://portal.etsi.org/TBSiteMap/OSM/ListofOSMMembers.aspx OSM Member or Participant]''', you can check here '''[https://osm.etsi.org/welcome/#join how to join OSM as an organization]'''<br /> ** If your company has '''already joined OSM but you do not have an EOL account''' yet, you can '''[http://webapp.etsi.org/createaccount/ request an EOL account]''' <br /> <br /> * If you are an '''individual contributor''', you can '''[https://osm.etsi.org/index2.php?page=page_register.php create your OSM account online]'''.<br /> <br /> If you need any help, contact us at [mailto:OSMsupport@etsi.org OSMsupport@etsi.org]<br /> <br /> = Report a bug on Bugzilla =<br /> # Go to the OSM Portal<br /> # Click on '''Bugzilla''' menu on the portal menu bar.<br /> # Click on "new" on Bugzilla menu bar.<br /> # Choose the product, e.g. "OSM".<br /> # Complete the bug form. If you know, choose the component, e.g OpenMANO, Riftware, UI, SO, etc.<br /> # Enter the bug summary, description, attachement, etc.<br /> # Click on the "Submit Bug" button to confirm.<br /> # A bug id is generated (e.g. Bug 6 -Small Error)<br /> <br /> = Clone your project =<br /> # Clone a '''git''' repository, for example: <pre> git clone https://osm.etsi.org/gerrit/osm/openmano.git </pre><br /> # Enter your username<br /> # Enter you password<br /> # It is recommended to install the Gerrit commit-msg hook for the cloned repository in order to automatically insert a Change-Id tag in commit messages. You can install it by entering the following command for openmano repository <pre> scp -p -P 29418 <username>@osm.etsi.org:hooks/commit-msg openmano/.git/hooks/ </pre> More information about the Gerrit commit-msg hook can be found here https://git.eclipse.org/r/Documentation/cmd-hook-commit-msg.html<br /> <br /> '''Note''': <br /> * You can find the project repository URL on '''[https://osm.etsi.org/gitweb/ Gitweb]''' or on '''[https://osm.etsi.org/gerrit/ Gerrit]'''<br /> ** On Gitweb<br /> **# Click on '''Gitweb''' menu on the portal menu bar.<br /> **# Select a product to see the available cloning URLs<br /> ** On Gerrit<br /> **# Click on '''Gerrit''' menu on the portal menu bar.<br /> **# Click on "Projects" menu on the Gerrit menu bar.<br /> **# Click on "List" menu.<br /> **# Select a product to see the available cloning URLs.<br /> *It is recommended to install the <br /> <pre>scp -p -P 29418 benalaya@osm.etsi.org:hooks/commit-msg openmano/.git/hooks/</pre><br /> <br /> = Configure your Git environment =<br /> # Configure your git username globally: <pre> git config --global user.name <username> </pre><br /> # Configure your git email address: <pre> git config --global user.email <email> </pre><br /> # Check your git configuration: <pre> git config --list </pre><br /> '''Note: Your email address will be visible on commits to Git. <br /> If you'd like to keep your email address private, you can mask your email as follows:<br /> if your email is <name@company.com> you can set user.email to <hidden@company.com><br /> This allows other users to identify you as a contributor (with your user name) and<br /> Git Stats to keep track of your company's contributions (with the email domain)<br /> <br /> In case you are using git in the same computer for other open source projects, you can restrict your git variables to the local folder: <pre>git config --local user.name <username><br /> git config --local user.email <email> </pre><br /> <br /> = Commit changes to your local project =<br /> # go to the "openmano" folder <pre>cd osm/openmano</pre><br /> # Make some changes on the source (e.g. add a line to the "example-file")<br /> # Stage the change. <pre> git add example-file </pre> <br /> # Commit the change to your local repository. You can add a bug id in your commit message to link the bug to your contribution <pre> git commit -s -m "Bug 2 fixed!!" </pre> <br /> # You can see your commit message and update it, if needed, using the following command: <pre>git commit --amend </pre><br /> <br /> ==Developer's Certificate of Origin== <br /> * The "-s" parameter enables to Sign the contribution. It adds the following line at the end of your commit message: <br /> <pre> Signed-off-by: Random J Developer <random@developer.example.org></pre><br /> <br /> * The sign-off is a simple line at the end of the explanation for the patch, which certifies that you wrote it or otherwise have the right to pass it on as a open-source patch. The rules are pretty simple: signing a contribution means that you can certify the below: <br /> <br /> <pre><br /> Developer's Certificate of Origin 1.1<br /> <br /> By making a contribution to this project, I certify that:<br /> <br /> (a) The contribution was created in whole or in part by me and I<br /> have the right to submit it under the open source license<br /> indicated in the file; or<br /> <br /> (b) The contribution is based upon previous work that, to the best<br /> of my knowledge, is covered under an appropriate open source<br /> license and I have the right under that license to submit that<br /> work with modifications, whether created in whole or in part<br /> by me, under the same open source license (unless I am<br /> permitted to submit under a different license), as indicated<br /> in the file; or<br /> <br /> (c) The contribution was provided directly to me by some other<br /> person who certified (a), (b) or (c) and I have not modified<br /> it.<br /> <br /> (d) I understand and agree that this project and the contribution<br /> are public and that a record of the contribution (including all<br /> personal information I submit with it, including my sign-off) is<br /> maintained indefinitely and may be redistributed consistent with<br /> this project or the open source license(s) involved.<br /> </pre><br /> <br /> = Push your contribution to Gerrit =<br /> # To avoid merge conflicts, it is recommended to do a pull with rebase before pushing your contribution in order to merge latest changes made by other users. <pre>git pull --rebase</pre> <br /> # Push your commits to '''Gerrit''' for Code Review using the following command <pre> git push origin HEAD:refs/for/master </pre><br /> # Enter your username.<br /> # Enter your password.<br /> # You can review your contribution on '''Gerrit''' web interface<br /> <br /> '''Notes:'''<br /> * The following actions are execution automatically after pushing any contribution to Gerrit: <br /> ** '''Gerrit''' reports the new contribution state to the corresponding bug in '''Bugzilla'''<br /> ** '''Gerrit''' notifies '''Jenkins''' to build the new contribution.<br /> <br /> = Gerrit Notifications =<br /> Gerrit sends email notifications to:<br /> • Owner of the change<br /> • Reviewers of the change<br /> • Project watchers <br /> <br /> Each user can configure his own watched projects and branches in the "settings/watched project" menu. Email notifications can be sent for New Changes, New Patch Sets, All Comments, Submitted Changes and Abandoned Changes.<br /> <br /> Link: [https://osm.etsi.org/gerrit/#/settings/projects https://osm.etsi.org/gerrit/#/settings/projects] (you can navigate there from the Gerrit console by clicking on the arrow by your login on the top right corner)<br /> <br /> = Continuous Integration =<br /> # '''Jenkins''' builds, tests the new contribution, and reports the result on its web interface.<br /> # '''Jenkins''' votes on the contribution using '''“Code-Verif”''' (-1, +1) on '''Gerrit'''.<br /> <br /> <br /> = Code Review =<br /> # Other '''contributors''' and '''MDG Committers''' can comment the new contribution and vote using '''“Code-Review”''' (-1, 0, +1) on '''Gerrit'''.<br /> # The '''MDG Leader''' can comment the new contribution and votes using '''“Code-Review”''' (-2, -1, 0, +1, +2) on '''Gerrit'''.<br /> <br /> <br /> = Merge the contribution =<br /> # The '''MDG Leader''' can "Submit" the change only if +1 '''"Code-Verif"''' (from '''Jenkins''') and at least one +2 '''"Code-Review"'''.<br /> # '''Gerrit''' reports the result of the code review to the corresponding bug in '''Bugzilla'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Workflow_with_OSM_tools&diff=679 Workflow with OSM tools 2016-07-18T20:07:00Z

<p>Benalaya: /* Push your contribution to Gerrit */</p> <hr /> <div>__TOC__<br /> <br /> <br /> = Login to OSM portal =<br /> # Go to OSM portal: https://osm.etsi.org/<br /> # Login using your username and password<br /> <br /> '''Note:'''<br /> * If you are '''[[Participate|contributing on behalf of your company]]''', you should login with your '''ETSI Online Account (EOL)'''. <br /> ** If your company is not yet an '''[https://portal.etsi.org/TBSiteMap/OSM/ListofOSMMembers.aspx OSM Member or Participant]''', you can check here '''[https://osm.etsi.org/welcome/#join how to join OSM as an organization]'''<br /> ** If your company has '''already joined OSM but you do not have an EOL account''' yet, you can '''[http://webapp.etsi.org/createaccount/ request an EOL account]''' <br /> <br /> * If you are an '''individual contributor''', you can '''[https://osm.etsi.org/index2.php?page=page_register.php create your OSM account online]'''.<br /> <br /> If you need any help, contact us at [mailto:OSMsupport@etsi.org OSMsupport@etsi.org]<br /> <br /> = Report a bug on Bugzilla =<br /> # Go to the OSM Portal<br /> # Click on '''Bugzilla''' menu on the portal menu bar.<br /> # Click on "new" on Bugzilla menu bar.<br /> # Choose the product, e.g. "OSM".<br /> # Complete the bug form. If you know, choose the component, e.g OpenMANO, Riftware, UI, SO, etc.<br /> # Enter the bug summary, description, attachement, etc.<br /> # Click on the "Submit Bug" button to confirm.<br /> # A bug id is generated (e.g. Bug 6 -Small Error)<br /> <br /> = Clone your project =<br /> # Clone a '''git''' repository, for example: <pre> git clone https://osm.etsi.org/gerrit/osm/openmano.git </pre><br /> # Enter your username<br /> # Enter you password<br /> '''Note''': <br /> * You can find the project repository URL on '''[https://osm.etsi.org/gitweb/ Gitweb]''' or on '''[https://osm.etsi.org/gerrit/ Gerrit]'''<br /> ** On Gitweb<br /> **# Click on '''Gitweb''' menu on the portal menu bar.<br /> **# Select a product to see the available cloning URLs<br /> ** On Gerrit<br /> **# Click on '''Gerrit''' menu on the portal menu bar.<br /> **# Click on "Projects" menu on the Gerrit menu bar.<br /> **# Click on "List" menu.<br /> **# Select a product to see the available cloning URLs.<br /> <br /> = Configure your Git environment =<br /> # Configure your git username globally: <pre> git config --global user.name <username> </pre><br /> # Configure your git email address: <pre> git config --global user.email <email> </pre><br /> # Check your git configuration: <pre> git config --list </pre><br /> '''Note: Your email address will be visible on commits to Git. <br /> If you'd like to keep your email address private, you can mask your email as follows:<br /> if your email is <name@company.com> you can set user.email to <hidden@company.com><br /> This allows other users to identify you as a contributor (with your user name) and<br /> Git Stats to keep track of your company's contributions (with the email domain)<br /> <br /> In case you are using git in the same computer for other open source projects, you can restrict your git variables to the local folder: <pre>git config --local user.name <username><br /> git config --local user.email <email> </pre><br /> <br /> = Commit changes to your local project =<br /> # go to the "openmano" folder <pre>cd osm/openmano</pre><br /> # Make some changes on the source (e.g. add a line to the "example-file")<br /> # Stage the change. <pre> git add example-file </pre> <br /> # Commit the change to your local repository. You can add a bug id in your commit message to link the bug to your contribution <pre> git commit -s -m "Bug 2 fixed!!" </pre> <br /> # You can see your commit message and update it, if needed, using the following command: <pre>git commit --amend </pre><br /> <br /> ==Developer's Certificate of Origin== <br /> * The "-s" parameter enables to Sign the contribution. It adds the following line at the end of your commit message: <br /> <pre> Signed-off-by: Random J Developer <random@developer.example.org></pre><br /> <br /> * The sign-off is a simple line at the end of the explanation for the patch, which certifies that you wrote it or otherwise have the right to pass it on as a open-source patch. The rules are pretty simple: signing a contribution means that you can certify the below: <br /> <br /> <pre><br /> Developer's Certificate of Origin 1.1<br /> <br /> By making a contribution to this project, I certify that:<br /> <br /> (a) The contribution was created in whole or in part by me and I<br /> have the right to submit it under the open source license<br /> indicated in the file; or<br /> <br /> (b) The contribution is based upon previous work that, to the best<br /> of my knowledge, is covered under an appropriate open source<br /> license and I have the right under that license to submit that<br /> work with modifications, whether created in whole or in part<br /> by me, under the same open source license (unless I am<br /> permitted to submit under a different license), as indicated<br /> in the file; or<br /> <br /> (c) The contribution was provided directly to me by some other<br /> person who certified (a), (b) or (c) and I have not modified<br /> it.<br /> <br /> (d) I understand and agree that this project and the contribution<br /> are public and that a record of the contribution (including all<br /> personal information I submit with it, including my sign-off) is<br /> maintained indefinitely and may be redistributed consistent with<br /> this project or the open source license(s) involved.<br /> </pre><br /> <br /> = Push your contribution to Gerrit =<br /> # To avoid merge conflicts, it is recommended to do a pull with rebase before pushing your contribution in order to merge latest changes made by other users. <pre>git pull --rebase</pre> <br /> # Push your commits to '''Gerrit''' for Code Review using the following command <pre> git push origin HEAD:refs/for/master </pre><br /> # Enter your username.<br /> # Enter your password.<br /> # You can review your contribution on '''Gerrit''' web interface<br /> <br /> '''Notes:'''<br /> * The following actions are execution automatically after pushing any contribution to Gerrit: <br /> ** '''Gerrit''' reports the new contribution state to the corresponding bug in '''Bugzilla'''<br /> ** '''Gerrit''' notifies '''Jenkins''' to build the new contribution.<br /> <br /> = Gerrit Notifications =<br /> Gerrit sends email notifications to:<br /> • Owner of the change<br /> • Reviewers of the change<br /> • Project watchers <br /> <br /> Each user can configure his own watched projects and branches in the "settings/watched project" menu. Email notifications can be sent for New Changes, New Patch Sets, All Comments, Submitted Changes and Abandoned Changes.<br /> <br /> Link: [https://osm.etsi.org/gerrit/#/settings/projects https://osm.etsi.org/gerrit/#/settings/projects] (you can navigate there from the Gerrit console by clicking on the arrow by your login on the top right corner)<br /> <br /> = Continuous Integration =<br /> # '''Jenkins''' builds, tests the new contribution, and reports the result on its web interface.<br /> # '''Jenkins''' votes on the contribution using '''“Code-Verif”''' (-1, +1) on '''Gerrit'''.<br /> <br /> <br /> = Code Review =<br /> # Other '''contributors''' and '''MDG Committers''' can comment the new contribution and vote using '''“Code-Review”''' (-1, 0, +1) on '''Gerrit'''.<br /> # The '''MDG Leader''' can comment the new contribution and votes using '''“Code-Review”''' (-2, -1, 0, +1, +2) on '''Gerrit'''.<br /> <br /> <br /> = Merge the contribution =<br /> # The '''MDG Leader''' can "Submit" the change only if +1 '''"Code-Verif"''' (from '''Jenkins''') and at least one +2 '''"Code-Review"'''.<br /> # '''Gerrit''' reports the result of the code review to the corresponding bug in '''Bugzilla'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Workflow_with_OSM_tools&diff=678 Workflow with OSM tools 2016-07-18T20:06:27Z

<p>Benalaya: /* Push your contribution to Gerrit */</p> <hr /> <div>__TOC__<br /> <br /> <br /> = Login to OSM portal =<br /> # Go to OSM portal: https://osm.etsi.org/<br /> # Login using your username and password<br /> <br /> '''Note:'''<br /> * If you are '''[[Participate|contributing on behalf of your company]]''', you should login with your '''ETSI Online Account (EOL)'''. <br /> ** If your company is not yet an '''[https://portal.etsi.org/TBSiteMap/OSM/ListofOSMMembers.aspx OSM Member or Participant]''', you can check here '''[https://osm.etsi.org/welcome/#join how to join OSM as an organization]'''<br /> ** If your company has '''already joined OSM but you do not have an EOL account''' yet, you can '''[http://webapp.etsi.org/createaccount/ request an EOL account]''' <br /> <br /> * If you are an '''individual contributor''', you can '''[https://osm.etsi.org/index2.php?page=page_register.php create your OSM account online]'''.<br /> <br /> If you need any help, contact us at [mailto:OSMsupport@etsi.org OSMsupport@etsi.org]<br /> <br /> = Report a bug on Bugzilla =<br /> # Go to the OSM Portal<br /> # Click on '''Bugzilla''' menu on the portal menu bar.<br /> # Click on "new" on Bugzilla menu bar.<br /> # Choose the product, e.g. "OSM".<br /> # Complete the bug form. If you know, choose the component, e.g OpenMANO, Riftware, UI, SO, etc.<br /> # Enter the bug summary, description, attachement, etc.<br /> # Click on the "Submit Bug" button to confirm.<br /> # A bug id is generated (e.g. Bug 6 -Small Error)<br /> <br /> = Clone your project =<br /> # Clone a '''git''' repository, for example: <pre> git clone https://osm.etsi.org/gerrit/osm/openmano.git </pre><br /> # Enter your username<br /> # Enter you password<br /> '''Note''': <br /> * You can find the project repository URL on '''[https://osm.etsi.org/gitweb/ Gitweb]''' or on '''[https://osm.etsi.org/gerrit/ Gerrit]'''<br /> ** On Gitweb<br /> **# Click on '''Gitweb''' menu on the portal menu bar.<br /> **# Select a product to see the available cloning URLs<br /> ** On Gerrit<br /> **# Click on '''Gerrit''' menu on the portal menu bar.<br /> **# Click on "Projects" menu on the Gerrit menu bar.<br /> **# Click on "List" menu.<br /> **# Select a product to see the available cloning URLs.<br /> <br /> = Configure your Git environment =<br /> # Configure your git username globally: <pre> git config --global user.name <username> </pre><br /> # Configure your git email address: <pre> git config --global user.email <email> </pre><br /> # Check your git configuration: <pre> git config --list </pre><br /> '''Note: Your email address will be visible on commits to Git. <br /> If you'd like to keep your email address private, you can mask your email as follows:<br /> if your email is <name@company.com> you can set user.email to <hidden@company.com><br /> This allows other users to identify you as a contributor (with your user name) and<br /> Git Stats to keep track of your company's contributions (with the email domain)<br /> <br /> In case you are using git in the same computer for other open source projects, you can restrict your git variables to the local folder: <pre>git config --local user.name <username><br /> git config --local user.email <email> </pre><br /> <br /> = Commit changes to your local project =<br /> # go to the "openmano" folder <pre>cd osm/openmano</pre><br /> # Make some changes on the source (e.g. add a line to the "example-file")<br /> # Stage the change. <pre> git add example-file </pre> <br /> # Commit the change to your local repository. You can add a bug id in your commit message to link the bug to your contribution <pre> git commit -s -m "Bug 2 fixed!!" </pre> <br /> # You can see your commit message and update it, if needed, using the following command: <pre>git commit --amend </pre><br /> <br /> ==Developer's Certificate of Origin== <br /> * The "-s" parameter enables to Sign the contribution. It adds the following line at the end of your commit message: <br /> <pre> Signed-off-by: Random J Developer <random@developer.example.org></pre><br /> <br /> * The sign-off is a simple line at the end of the explanation for the patch, which certifies that you wrote it or otherwise have the right to pass it on as a open-source patch. The rules are pretty simple: signing a contribution means that you can certify the below: <br /> <br /> <pre><br /> Developer's Certificate of Origin 1.1<br /> <br /> By making a contribution to this project, I certify that:<br /> <br /> (a) The contribution was created in whole or in part by me and I<br /> have the right to submit it under the open source license<br /> indicated in the file; or<br /> <br /> (b) The contribution is based upon previous work that, to the best<br /> of my knowledge, is covered under an appropriate open source<br /> license and I have the right under that license to submit that<br /> work with modifications, whether created in whole or in part<br /> by me, under the same open source license (unless I am<br /> permitted to submit under a different license), as indicated<br /> in the file; or<br /> <br /> (c) The contribution was provided directly to me by some other<br /> person who certified (a), (b) or (c) and I have not modified<br /> it.<br /> <br /> (d) I understand and agree that this project and the contribution<br /> are public and that a record of the contribution (including all<br /> personal information I submit with it, including my sign-off) is<br /> maintained indefinitely and may be redistributed consistent with<br /> this project or the open source license(s) involved.<br /> </pre><br /> <br /> = Push your contribution to Gerrit =<br /> # To avoid merge conflicts, it is recommended to do a pull with rebase before pushing your contribution in order to merge the changes made by other users. <pre>git pull --rebase</pre> <br /> # Push your commits to '''Gerrit''' for Code Review using the following command <pre> git push origin HEAD:refs/for/master </pre><br /> # Enter your username.<br /> # Enter your password.<br /> # You can review your contribution on '''Gerrit''' web interface<br /> <br /> '''Notes:'''<br /> * The following actions are execution automatically after pushing any contribution to Gerrit: <br /> ** '''Gerrit''' reports the new contribution state to the corresponding bug in '''Bugzilla'''<br /> ** '''Gerrit''' notifies '''Jenkins''' to build the new contribution.<br /> <br /> = Gerrit Notifications =<br /> Gerrit sends email notifications to:<br /> • Owner of the change<br /> • Reviewers of the change<br /> • Project watchers <br /> <br /> Each user can configure his own watched projects and branches in the "settings/watched project" menu. Email notifications can be sent for New Changes, New Patch Sets, All Comments, Submitted Changes and Abandoned Changes.<br /> <br /> Link: [https://osm.etsi.org/gerrit/#/settings/projects https://osm.etsi.org/gerrit/#/settings/projects] (you can navigate there from the Gerrit console by clicking on the arrow by your login on the top right corner)<br /> <br /> = Continuous Integration =<br /> # '''Jenkins''' builds, tests the new contribution, and reports the result on its web interface.<br /> # '''Jenkins''' votes on the contribution using '''“Code-Verif”''' (-1, +1) on '''Gerrit'''.<br /> <br /> <br /> = Code Review =<br /> # Other '''contributors''' and '''MDG Committers''' can comment the new contribution and vote using '''“Code-Review”''' (-1, 0, +1) on '''Gerrit'''.<br /> # The '''MDG Leader''' can comment the new contribution and votes using '''“Code-Review”''' (-2, -1, 0, +1, +2) on '''Gerrit'''.<br /> <br /> <br /> = Merge the contribution =<br /> # The '''MDG Leader''' can "Submit" the change only if +1 '''"Code-Verif"''' (from '''Jenkins''') and at least one +2 '''"Code-Review"'''.<br /> # '''Gerrit''' reports the result of the code review to the corresponding bug in '''Bugzilla'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Workflow_with_OSM_tools&diff=677 Workflow with OSM tools 2016-07-18T20:05:57Z

<p>Benalaya: /* Push your contribution to Gerrit */</p> <hr /> <div>__TOC__<br /> <br /> <br /> = Login to OSM portal =<br /> # Go to OSM portal: https://osm.etsi.org/<br /> # Login using your username and password<br /> <br /> '''Note:'''<br /> * If you are '''[[Participate|contributing on behalf of your company]]''', you should login with your '''ETSI Online Account (EOL)'''. <br /> ** If your company is not yet an '''[https://portal.etsi.org/TBSiteMap/OSM/ListofOSMMembers.aspx OSM Member or Participant]''', you can check here '''[https://osm.etsi.org/welcome/#join how to join OSM as an organization]'''<br /> ** If your company has '''already joined OSM but you do not have an EOL account''' yet, you can '''[http://webapp.etsi.org/createaccount/ request an EOL account]''' <br /> <br /> * If you are an '''individual contributor''', you can '''[https://osm.etsi.org/index2.php?page=page_register.php create your OSM account online]'''.<br /> <br /> If you need any help, contact us at [mailto:OSMsupport@etsi.org OSMsupport@etsi.org]<br /> <br /> = Report a bug on Bugzilla =<br /> # Go to the OSM Portal<br /> # Click on '''Bugzilla''' menu on the portal menu bar.<br /> # Click on "new" on Bugzilla menu bar.<br /> # Choose the product, e.g. "OSM".<br /> # Complete the bug form. If you know, choose the component, e.g OpenMANO, Riftware, UI, SO, etc.<br /> # Enter the bug summary, description, attachement, etc.<br /> # Click on the "Submit Bug" button to confirm.<br /> # A bug id is generated (e.g. Bug 6 -Small Error)<br /> <br /> = Clone your project =<br /> # Clone a '''git''' repository, for example: <pre> git clone https://osm.etsi.org/gerrit/osm/openmano.git </pre><br /> # Enter your username<br /> # Enter you password<br /> '''Note''': <br /> * You can find the project repository URL on '''[https://osm.etsi.org/gitweb/ Gitweb]''' or on '''[https://osm.etsi.org/gerrit/ Gerrit]'''<br /> ** On Gitweb<br /> **# Click on '''Gitweb''' menu on the portal menu bar.<br /> **# Select a product to see the available cloning URLs<br /> ** On Gerrit<br /> **# Click on '''Gerrit''' menu on the portal menu bar.<br /> **# Click on "Projects" menu on the Gerrit menu bar.<br /> **# Click on "List" menu.<br /> **# Select a product to see the available cloning URLs.<br /> <br /> = Configure your Git environment =<br /> # Configure your git username globally: <pre> git config --global user.name <username> </pre><br /> # Configure your git email address: <pre> git config --global user.email <email> </pre><br /> # Check your git configuration: <pre> git config --list </pre><br /> '''Note: Your email address will be visible on commits to Git. <br /> If you'd like to keep your email address private, you can mask your email as follows:<br /> if your email is <name@company.com> you can set user.email to <hidden@company.com><br /> This allows other users to identify you as a contributor (with your user name) and<br /> Git Stats to keep track of your company's contributions (with the email domain)<br /> <br /> In case you are using git in the same computer for other open source projects, you can restrict your git variables to the local folder: <pre>git config --local user.name <username><br /> git config --local user.email <email> </pre><br /> <br /> = Commit changes to your local project =<br /> # go to the "openmano" folder <pre>cd osm/openmano</pre><br /> # Make some changes on the source (e.g. add a line to the "example-file")<br /> # Stage the change. <pre> git add example-file </pre> <br /> # Commit the change to your local repository. You can add a bug id in your commit message to link the bug to your contribution <pre> git commit -s -m "Bug 2 fixed!!" </pre> <br /> # You can see your commit message and update it, if needed, using the following command: <pre>git commit --amend </pre><br /> <br /> ==Developer's Certificate of Origin== <br /> * The "-s" parameter enables to Sign the contribution. It adds the following line at the end of your commit message: <br /> <pre> Signed-off-by: Random J Developer <random@developer.example.org></pre><br /> <br /> * The sign-off is a simple line at the end of the explanation for the patch, which certifies that you wrote it or otherwise have the right to pass it on as a open-source patch. The rules are pretty simple: signing a contribution means that you can certify the below: <br /> <br /> <pre><br /> Developer's Certificate of Origin 1.1<br /> <br /> By making a contribution to this project, I certify that:<br /> <br /> (a) The contribution was created in whole or in part by me and I<br /> have the right to submit it under the open source license<br /> indicated in the file; or<br /> <br /> (b) The contribution is based upon previous work that, to the best<br /> of my knowledge, is covered under an appropriate open source<br /> license and I have the right under that license to submit that<br /> work with modifications, whether created in whole or in part<br /> by me, under the same open source license (unless I am<br /> permitted to submit under a different license), as indicated<br /> in the file; or<br /> <br /> (c) The contribution was provided directly to me by some other<br /> person who certified (a), (b) or (c) and I have not modified<br /> it.<br /> <br /> (d) I understand and agree that this project and the contribution<br /> are public and that a record of the contribution (including all<br /> personal information I submit with it, including my sign-off) is<br /> maintained indefinitely and may be redistributed consistent with<br /> this project or the open source license(s) involved.<br /> </pre><br /> <br /> = Push your contribution to Gerrit =<br /> # To avoid merge conflicts, it is recommended to do a pull with rebase in order to merge the changes made by other users before pushing your contribution. <pre>git pull --rebase</pre> <br /> # Push your commits to '''Gerrit''' for Code Review using the following command <pre> git push origin HEAD:refs/for/master </pre><br /> # Enter your username.<br /> # Enter your password.<br /> # You can review your contribution on '''Gerrit''' web interface<br /> <br /> '''Notes:'''<br /> * The following actions are execution automatically after pushing any contribution to Gerrit: <br /> ** '''Gerrit''' reports the new contribution state to the corresponding bug in '''Bugzilla'''<br /> ** '''Gerrit''' notifies '''Jenkins''' to build the new contribution.<br /> <br /> = Gerrit Notifications =<br /> Gerrit sends email notifications to:<br /> • Owner of the change<br /> • Reviewers of the change<br /> • Project watchers <br /> <br /> Each user can configure his own watched projects and branches in the "settings/watched project" menu. Email notifications can be sent for New Changes, New Patch Sets, All Comments, Submitted Changes and Abandoned Changes.<br /> <br /> Link: [https://osm.etsi.org/gerrit/#/settings/projects https://osm.etsi.org/gerrit/#/settings/projects] (you can navigate there from the Gerrit console by clicking on the arrow by your login on the top right corner)<br /> <br /> = Continuous Integration =<br /> # '''Jenkins''' builds, tests the new contribution, and reports the result on its web interface.<br /> # '''Jenkins''' votes on the contribution using '''“Code-Verif”''' (-1, +1) on '''Gerrit'''.<br /> <br /> <br /> = Code Review =<br /> # Other '''contributors''' and '''MDG Committers''' can comment the new contribution and vote using '''“Code-Review”''' (-1, 0, +1) on '''Gerrit'''.<br /> # The '''MDG Leader''' can comment the new contribution and votes using '''“Code-Review”''' (-2, -1, 0, +1, +2) on '''Gerrit'''.<br /> <br /> <br /> = Merge the contribution =<br /> # The '''MDG Leader''' can "Submit" the change only if +1 '''"Code-Verif"''' (from '''Jenkins''') and at least one +2 '''"Code-Review"'''.<br /> # '''Gerrit''' reports the result of the code review to the corresponding bug in '''Bugzilla'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=MediaWiki:Sidebar&diff=50 MediaWiki:Sidebar 2016-04-02T12:14:18Z

<p>Benalaya: </p> <hr /> <div><br /> * navigation<br /> ** mainpage|mainpage-description<br /> ** recentchanges-url|recentchanges<br /> ** randompage-url|randompage<br /> ** helppage|help</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=MediaWiki:Sidebar&diff=49 MediaWiki:Sidebar 2016-04-02T12:13:57Z

<p>Benalaya: </p> <hr /> <div><br /> * navigation<br /> ** mainpage|mainpage-description<br /> ** recentchanges-url|recentchanges<br /> ** randompage-url|randompage<br /> ** helppage|help<br /> ** Special:UserLogin|Log in<br /> * SEARCH</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=MediaWiki:Sidebar&diff=48 MediaWiki:Sidebar 2016-04-02T12:13:21Z

<p>Benalaya: </p> <hr /> <div><br /> * navigation<br /> ** mainpage|mainpage-description<br /> ** recentchanges-url|recentchanges<br /> ** randompage-url|randompage<br /> ** helppage|help<br /> ** Special:UserLogin|Log in</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=MediaWiki:Sidebar&diff=47 MediaWiki:Sidebar 2016-04-02T12:13:06Z

<p>Benalaya: </p> <hr /> <div><br /> * navigation<br /> ** mainpage|mainpage-description<br /> ** recentchanges-url|recentchanges<br /> ** randompage-url|randompage<br /> ** helppage|help<br /> ** Special:UserLogin|Log in<br /> * navigation2<br /> ** mainpage|mainpage-description<br /> ** recentchanges-url|recentchanges<br /> ** randompage-url|randompage<br /> ** helppage|help<br /> ** Special:UserLogin|Log in</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=MediaWiki:Sidebar&diff=24 MediaWiki:Sidebar 2016-03-28T12:27:53Z

<p>Benalaya: Created page with " * navigation ** mainpage|mainpage-description ** recentchanges-url|recentchanges ** randompage-url|randompage ** helppage|help ** Special:UserLogin|Log in"</p> <hr /> <div><br /> * navigation<br /> ** mainpage|mainpage-description<br /> ** recentchanges-url|recentchanges<br /> ** randompage-url|randompage<br /> ** helppage|help<br /> ** Special:UserLogin|Log in</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Workflow_with_OSM_tools&diff=23 Workflow with OSM tools 2016-03-24T13:51:26Z

<p>Benalaya: </p> <hr /> <div>__TOC__<br /> <br /> <br /> = Login to OSM portal =<br /> # Go to OSM portal: https://osm.etsi.org/portal<br /> # Login using your username and password<br /> <br /> '''Note:'''<br /> * If you are '''[[Participate|contributing on behalf of your company]]''', you should login with your '''ETSI Online Account (EOL)'''. <br /> ** If your company is not yet an '''[https://portal.etsi.org/TBSiteMap/OSM/ListofOSMMembers.aspx OSM Member or Participant]''', you can check here '''[https://osm.etsi.org/welcome/#join how to join OSM as an organization]'''<br /> ** If your company has '''already joined OSM but you do not have an EOL account''' yet, you can '''[http://webapp.etsi.org/createaccount/ request an EOL account]''' <br /> <br /> * If you are an '''individual contributor''', you can '''[https://osm.etsi.org/index2.php?page=page_register.php create your OSM account online]'''.<br /> <br /> If you need any help, contact us at [mailto:OSMsupport@etsi.org OSMsupport@etsi.org]<br /> <br /> = Report a bug on Bugzilla =<br /> # Go to the OSM Portal<br /> # Click on '''Bugzilla''' menu on the portal menu bar.<br /> # Click on "new" on Bugzilla menu bar.<br /> # Chose the "template‑product".<br /> # Complete the bug form: For component, chose "template-code".<br /> # Enter the bug summary, description, attachement, etc.<br /> # Click on the "Submit Bug" button to confirm.<br /> # A bug id is generated (e.g. Bug 6 -Small Error)<br /> <br /> <br /> = Clone your project =<br /> # Clone a '''git''' repository, for example: <pre> git clone https://osm.etsi.org/gerrit/template-code </pre><br /> # Enter your username<br /> # Enter you password<br /> '''Note''': <br /> * you can find the project repository URL on '''Gitweb''' or on '''Gerrit'''<br /> ** On Gitweb<br /> **# Click on '''Gitweb''' menu on the portal menu bar.<br /> **# Select a product to see the available cloning URLs<br /> ** On Gerrit<br /> **# Click on '''Gerrit''' menu on the portal menu bar.<br /> **# Click on "Projects" menu on the Gerrit menu bar.<br /> **# Click on "List" menu.<br /> **# Select a product to see the available cloning URLs.<br /> <br /> <br /> = Configure your Git environment =<br /> # Configure your git username: <pre> git config --global user.name <username> </pre><br /> # Configure your git email address: <pre> git config --global user.email <email> </pre><br /> # Check your git configuration: <pre> git config --list </pre><br /> '''Note: Your email address will be visible on commits to Git. <br /> If you'd like to keep your email address private, you can mask your email as follows:<br /> if your email is <name@company.com> you can set user.email to <hidden@company.com><br /> This allows other users to identify you as a contributor (with your user name) and<br /> Git Stats to keep track of your company's contributions (with the email domain)<br /> <br /> = Commit changes to your local project =<br /> # go to "template-code" folder <pre>cd template-code</pre><br /> # Make some changes on the source (e.g. add a line to the "example-file")<br /> # Stage the change. <pre> git add example-file </pre> <br /> # Commit the change to your local repository. You can add a bug id in your commit message to link the bug to your contribution <pre> git commit -s -m "Bug 2 fixed!!" </pre> <br /> # You can see your commit message and update it, if needed, using the following command: <pre>git commit --amend </pre><br /> '''Note:''' <br /> * The "-s" parameter enables to Sign the contribution. It adds the following line at the end of your commit message: <br /> <pre> Signed-off-by: Random J Developer <random@developer.example.org></pre><br /> <br /> * The sign-off is a simple line at the end of the explanation for the patch, which certifies that you wrote it or otherwise have the right to pass it on as a open-source patch. The rules are pretty simple: signing a contribution means that you can certify the below: <br /> <pre><br /> Developer's Certificate of Origin 1.1<br /> <br /> By making a contribution to this project, I certify that:<br /> <br /> (a) The contribution was created in whole or in part by me and I<br /> have the right to submit it under the open source license<br /> indicated in the file; or<br /> <br /> (b) The contribution is based upon previous work that, to the best<br /> of my knowledge, is covered under an appropriate open source<br /> license and I have the right under that license to submit that<br /> work with modifications, whether created in whole or in part<br /> by me, under the same open source license (unless I am<br /> permitted to submit under a different license), as indicated<br /> in the file; or<br /> <br /> (c) The contribution was provided directly to me by some other<br /> person who certified (a), (b) or (c) and I have not modified<br /> it.<br /> <br /> (d) I understand and agree that this project and the contribution<br /> are public and that a record of the contribution (including all<br /> personal information I submit with it, including my sign-off) is<br /> maintained indefinitely and may be redistributed consistent with<br /> this project or the open source license(s) involved.<br /> </pre><br /> <br /> = Push your contribution to Gerrit =<br /> # Push your commits to '''Gerrit''' for Code Review using the following command <pre> git push origin HEAD:refs/for/master </pre><br /> # Enter your username.<br /> # Enter your password.<br /> # You can review your contribution on '''Gerrit''' web interface<br /> <br /> '''Notes:'''<br /> * The following actions are execution automatically after pushing any contribution to Gerrit: <br /> ** '''Gerrit''' reports the new contribution state to the corresponding bug in '''Bugzilla'''<br /> ** '''Gerrit''' notifies '''Jenkins''' to build the new contribution.<br /> <br /> = Continuous Integration =<br /> # '''Jenkins''' builds, tests the new contribution, and reports the result on its web interface.<br /> # '''Jenkins''' votes on the contribution using '''“Code-Verif”''' (-1, +1) on '''Gerrit'''.<br /> <br /> <br /> = Code Review =<br /> # Other '''contributors''' and '''MDG Committers''' can comment the new contribution and vote using '''“Code-Review”''' (-1, 0, +1) on '''Gerrit'''.<br /> # The '''MDG Leader''' can comment the new contribution and votes using '''“Code-Review”''' (-2, -1, 0, +1, +2) on '''Gerrit'''.<br /> <br /> <br /> = Merge the contribution =<br /> # The '''MDG Leader''' can "Submit" the change only if +1 '''"Code-Verif"''' (from '''Jenkins''') and at least one +2 '''"Code-Review"'''.<br /> # '''Gerrit''' reports the result of the code review to the corresponding bug in '''Bugzilla'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=22 Participate 2016-03-24T13:51:09Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement (MEmber or Participant) and a Corporate Contribution License Agreement (CCLA). [https://osm.etsi.org/welcome/#join Learn more]<br /> <br /> [https://portal.etsi.org/TBSiteMap/OSM/ListofOSMMembers.aspx Check if your company is already participating to ETSI OSM]<br /> <br /> [http://www.etsi.org/membership/current-members Check if your company is an ETSI member]<br /> <br /> * '''As an individual contributor''' <br /> <br /> Individual contributors can participate to ETSI OSM by agreeing to the Individual Contributor License Agreement ICLA) and '''[https://osm.etsi.org/index2.php?page=page_register.php creating an individual account on-line]'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=21 Participate 2016-03-24T09:32:51Z

<p>Benalaya: Blanked the page</p> <hr /> <div></div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Workflow_with_OSM_tools&diff=20 Workflow with OSM tools 2016-03-24T09:32:24Z

<p>Benalaya: Blanked the page</p> <hr /> <div></div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=19 Participate 2016-03-24T09:20:20Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement and a Corporate Contribution License Agreement (CCLA). <br /> <br /> [https://portal.etsi.org/TBSiteMap/OSM/ListofOSMMembers.aspx Check if your company is already participating to ETSI OSM]<br /> <br /> [http://www.etsi.org/membership/current-members Check if your company is an ETSI member]<br /> <br /> * '''As an individual contributor''' <br /> <br /> Individual contributors can participate to ETSI OSM by agreeing to the Individual Contributor License Agreement ICLA) and '''[https://osm.etsi.org/index2.php?page=page_register.php creating an individual account on-line]'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=18 Participate 2016-03-24T09:20:02Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement <br /> <br /> [https://portal.etsi.org/TBSiteMap/OSM/ListofOSMMembers.aspx Check if your company is already participating to ETSI OSM]<br /> <br /> [http://www.etsi.org/membership/current-members Check if your company is an ETSI member]<br /> <br /> * '''As an individual contributor''' <br /> <br /> Individual contributors can participate to ETSI OSM by agreeing to the Individual Contributor License Agreement ICLA) and '''[https://osm.etsi.org/index2.php?page=page_register.php creating an individual account on-line]'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=17 Participate 2016-03-24T09:19:13Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> <br /> <br /> [https://portal.etsi.org/TBSiteMap/OSM/ListofOSMMembers.aspx Check if your company is already participating to ETSI OSM]<br /> <br /> [http://www.etsi.org/membership/current-members Check if your company is an ETSI member]<br /> <br /> * '''As an individual contributor''' <br /> <br /> Individual contributors can participate to ETSI OSM by agreeing to the Individual Contributor License Agreement ICLA) and '''[https://osm.etsi.org/index2.php?page=page_register.php creating an individual account on-line]'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=16 Participate 2016-03-24T09:18:59Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement MEmberdazdazd<br /> There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement MEmberdazdazd<br /> There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement MEmberdazdazdThere are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement MEmberdazdazdThere are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement MEmberdazdazdThere are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement MEmberdazdazd</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=15 Participate 2016-03-24T09:18:51Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement MEmberdazdazd</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=14 Participate 2016-03-24T09:18:42Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> <br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Agreement MEmber</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=13 Participate 2016-03-24T09:17:32Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=12 Participate 2016-03-24T09:16:30Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate OSM agreement</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=11 Participate 2016-03-24T09:16:24Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature of the appropriate</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=10 Participate 2016-03-24T09:16:18Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> Participating to as an organization is '''open to members and non-members of ETSI''' upon signature</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=9 Participate 2016-03-24T09:15:50Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''<br /> Participating to as an organization is '''open to members and non-members of ETSI'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Workflow_with_OSM_tools&diff=8 Workflow with OSM tools 2016-03-24T09:14:16Z

<p>Benalaya: </p> <hr /> <div><br /> test<br /> <br /> test<br /> test<br /> test<br /> test<br /> test<br /> test<br /> test<br /> test<br /> <br /> test<br /> test<br /> test<br /> test<br /> test<br /> test<br /> test<br /> test<br /> <br /> test<br /> test<br /> test<br /> test<br /> test<br /> test<br /> test</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Workflow_with_OSM_tools&diff=7 Workflow with OSM tools 2016-03-24T09:14:11Z

<p>Benalaya: </p> <hr /> <div><br /> test<br /> <br /> test<br /> test<br /> test<br /> test<br /> test<br /> test<br /> test</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Workflow_with_OSM_tools&diff=6 Workflow with OSM tools 2016-03-24T09:13:55Z

<p>Benalaya: Created page with "test"</p> <hr /> <div>test</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=5 Participate 2016-03-24T09:04:49Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM<br /> <br /> * '''As an organization'''</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=4 Participate 2016-03-24T09:04:40Z

<p>Benalaya: </p> <hr /> <div>There are multiple ways to participate to ETSI OSM</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Participate&diff=3 Participate 2016-03-24T09:04:01Z

<p>Benalaya: Created page with "aaa"</p> <hr /> <div>aaa</div>

Benalaya https://osm.etsi.org/wikipub/index.php?title=Old_Main_Page&diff=2 Old Main Page 2016-03-24T09:00:37Z

<p>Benalaya: </p> <hr /> <div>Welcome to OSM wiki.<br /> <br /> [[Participate|Participating to OSM]]<br /> <br /> [[Workflow|OSM development workflow]]</div>

Benalaya