Skip to content

GitLab

Commit b86b904e authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

clean

parent 72ba58a7
Pipeline #15359 passed with stage
in 3 minutes and 36 seconds
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ b86b904e
......@@ -22,5 +22,5 @@ build:
script:
- docker build -t ${DOCKER_TAG} .
- docker run --rm -e SECRET_KEY -e GITHUB_WEBHOOK_KEY -e GITLAB_WEBHOOK_KEY -e GITHUB_PIPELINE_TOKEN -e GITLAB_PIPELINE_TOKEN -e PYTHONWARNINGS ${DOCKER_TAG} ./manage.py migrate
- docker run --rm -e SECRET_KEY -e GITHUB_WEBHOOK_KEY -e GITLAB_WEBHOOK_KEY -e GITHUB_PIPELINE_TOKEN -e GITLAB_PIPELINE_TOKEN -e PYTHONWARNINGS ${DOCKER_TAG} ./manage.py test --parallel 1
- docker run --rm -e SECRET_KEY -e GITHUB_WEBHOOK_KEY -e GITLAB_WEBHOOK_KEY -e GITHUB_PIPELINE_TOKEN -e GITLAB_PIPELINE_TOKEN -e PYTHONWARNINGS ${DOCKER_TAG} ./manage.py test
- docker push ${DOCKER_TAG}
gh/tests.py
View file @ b86b904e
......@@ -59,7 +59,6 @@ class GhTests(TestCase):
if branch_name in gl_branches:
cls.gitlab.branches.delete(branch_name)
logging.basicConfig(level=logging.DEBUG)
LOGGER.info('start gh tests')
def assertSync(self, branch):
......@@ -125,7 +124,6 @@ class GhTests(TestCase):
msg = force_bytes(request_body)
signature = 'sha1=' + hmac.new(force_bytes(settings.GITHUB_WEBHOOK_KEY), msg, digestmod=sha1).hexdigest()
LOGGER.info('posting a simulated gh webhook event')
LOGGER.debug(f'with: {data}')
return await self.async_client.post(reverse('webhook'),
data,
content_type='application/json',
......@@ -362,53 +360,35 @@ class GhTests(TestCase):
async def test_pr(self):
"""Test github's pull requests."""
LOGGER.debug('test_pr: 0')
await self.sync()
LOGGER.debug('test_pr: 1')
not_accepted_string = "doesn't usually accept pull requests on master"
LOGGER.debug('test_pr: 2')
# Test pr on master
last_commit = self.github.get_branch("devel").commit.sha
LOGGER.debug('test_pr: 3')
github = await sync_to_async(self.project.github)()
LOGGER.debug('test_pr: 4')
pr_master = github.create_pull(title="Test pr on master", body='', head="devel", base="master")
LOGGER.debug('test_pr: 5')
response = await self.gh_webhook_event('pull_request',
last_commit=last_commit,
pr_action="opened",
pr_login="foo",
pr_number=pr_master.number)
LOGGER.debug('test_pr: 6')
self.assertEqual(response.status_code, 200)
LOGGER.debug('test_pr: 7')
self.assertTrue([c.body for c in pr_master.get_issue_comments() if not_accepted_string in c.body])
LOGGER.debug('test_pr: 8')
await sleep(60)
LOGGER.debug('test_pr: 9')
await sleep(30)
self.assertIn(f'pr/{pr_master.number}', [b.name for b in self.gitlab.branches.list()])
LOGGER.debug('test_pr: 10')
# Test pr on devel
last_commit = self.github.get_branch("master").commit.sha
LOGGER.debug('test_pr: 11')
pr_devel = github.create_pull(title="Test pr on devel", body='', head="master", base="devel")
LOGGER.debug('test_pr: 12')
response = await self.gh_webhook_event('pull_request',
last_commit=last_commit,
pr_action="opened",
pr_login="foo",
pr_number=pr_devel.number)
LOGGER.debug('test_pr: 13')
self.assertEqual(response.status_code, 200)
LOGGER.debug('test_pr: 14')
self.assertFalse([c.body for c in pr_devel.get_issue_comments() if not_accepted_string in c.body])
LOGGER.debug('test_pr: 15')
await sleep(60)
LOGGER.debug('test_pr: 16')
await sleep(30)
self.assertIn(f'pr/{pr_devel.number}', [b.name for b in self.gitlab.branches.list()])
LOGGER.debug('test_pr: 17')
# Close the pr
for pr in [pr_master, pr_devel]:
......@@ -418,5 +398,5 @@ class GhTests(TestCase):
pr_login="foo",
pr_number=pr.number)
self.assertEqual(response.status_code, 200)
await sleep(60)
await sleep(30)
self.assertNotIn(f'pr/{pr.number}', [b.name for b in self.gitlab.branches.list()])
gh/views.py
View file @ b86b904e
......@@ -65,9 +65,9 @@ async def pull_request(request: HttpRequest, rep: str) -> HttpResponse:
gh = await sync_to_async(project.github)()
pr = await sync_to_async(gh.get_pull)(data["number"])
pr_branch = pr.base.ref
if not project.accept_pr_to_master and pr_branch == 'master' and 'devel' in [
b.name for b in await sync_to_async(gh.get_branches)()
] and login != namespace.slug_github:
branches = [b.name for b in await sync_to_async(gh.get_branches)()]
if (not project.accept_pr_to_master and pr_branch == 'master' and 'devel' in branches
and login != namespace.slug_github):
logger.info(f"{namespace.slug}/{project.slug}: New pr {data['number']} to master")
await sync_to_async(pr.create_issue_comment)(PR_MASTER_MSG)
......@@ -117,7 +117,6 @@ async def pull_request(request: HttpRequest, rep: str) -> HttpResponse:
async def push(request: HttpRequest, source: SOURCES, rep: str) -> HttpResponse:
"""Someone pushed on github or gitlab. Synchronise local & remote repos."""
logger.debug('start gh.views.push')
data = loads(request.body.decode())
slug = slugify(data['repository']['name'])
......@@ -211,7 +210,6 @@ async def push(request: HttpRequest, source: SOURCES, rep: str) -> HttpResponse:
async def pipeline(request: HttpRequest, rep: str) -> HttpResponse:
"""Something happened on a Gitlab pipeline. Tell Github if necessary."""
logger.debug('start gh.views.pipeline')
data = loads(request.body.decode())
branch, commit, gl_status, pipeline_id = (data['object_attributes'][key] for key in ['ref', 'sha', 'status', 'id'])
namespace = await sync_to_async(get_object_or_404)(Namespace,
......@@ -256,7 +254,6 @@ async def webhook(request: HttpRequest) -> HttpResponse:
thx https://simpleisbetterthancomplex.com/tutorial/2016/10/31/how-to-handle-github-webhooks-using-django.html
"""
logger.info('GH webhook')
# validate ip source
forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR').split(', ')[0]
# networks = httpx.get('https://api.github.com/meta').json()['hooks'] # Fails if API rate limit exceeded
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment