opendev/system-config
Code Issues Proposed changes

Merge "Update ICLA to reference OpenInfra"

Browse Source
This commit is contained in:
Zuul 2021-10-08 01:14:34 +00:00 committed by Gerrit Code Review
commit 5f96f2abe3
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
playbooks/zuul/gerrit/files/static/cla.html
View File

@ -1,29 +1,15 @@
<html><body><div>
<h1>
OpenStack Project Individual Contributor License Agreement
OpenInfra Foundation Individual Contributor License Agreement
</h1>
<!--
This is the current OpenStack Project Individual Contributor License Agreement
reformatted for HTML from the original "RevisedCLA.doc" with SHA1 sum
0467dd893d276cefde614e063a363b995d67e5ee provided by Jonathan Bryce, Executive
Director on behalf of The OpenStack Foundation on Monday, January 7, 2013. No
textual content was changed except to replace quote marks with their strict
ASCII equivalents, add the original LLC CLA text as a block quote, and restore
a previously inapplicable statement (sentence #2 of paragraph #2) adapted from
the Apache Software Foundation ICLA at his direction.
This is the current OpenInfra Foundation Individual Contributor License Agreement revised at the request of Jonathan Bryce, Executive Director on behalf of The OpenStack Foundation d/b/a OpenInfra Foundation on December 5, 2017. No textual content was updated beyond revisions to the first paragraph.
-->
<p><em>
In order to clarify the intellectual property license granted with
Contributions from any person or entity, the OpenStack Project (the "Project")
must have a Contributor License Agreement ("Agreement") on file that has been
signed by each Contributor, indicating agreement to the license terms below.
This license is for your protection as a Contributor as well as the protection
of OpenStack Foundation as Project manager (the "Project Manager") and the
Project users; it does not change your rights to use your own Contributions for
any other purpose.
In order to clarify the intellectual property license granted with Contributions from any person or entity, the OpenStack Foundation d/b/a Open Infrastructure Foundation must have a Contributor License Agreement ("Agreement") on file that has been signed by each Contributor, indicating agreement to the license terms below for Contributions to any project owned or managed by the OpenStack Foundation d/b/a Open Infrastructure Foundation ("Project"). This license is for your protection as a Contributor as well as the protection of OpenStack Foundation d/b/a Open Infrastructure Foundation as Project Manager (the "Project Manager") and the Project users; it does not change your rights to use your own Contributions for any other purpose.
</em></p>
<p><em>

4
testinfra/test_gerrit.py
View File

@ -58,10 +58,10 @@ def test_opendev_logo(host):
assert '200 OK' in cmd.stdout
assert 'Content-Type: image/png' in cmd.stdout
def test_openstack_cla(host):
def test_openinfra_cla(host):
cmd = host.run('curl --include --insecure '
'--resolve review.opendev.org:443:127.0.0.1 '
'https://review.opendev.org/static/cla.html')
assert '200 OK' in cmd.stdout
assert 'Content-Type: text/html' in cmd.stdout
assert 'OpenStack Project Individual Contributor License Agreement' in cmd.stdout
assert 'OpenInfra Foundation Individual Contributor License Agreement' in cmd.stdout