External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-132. Auto-update a new project using SCM when saved.

Browse Source
This commit is contained in:
Chris Church
2013-09-09 18:54:29 -04:00
parent cad3612a8f
commit f7f12be0ad
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/__init__.py
View File

@@ -701,6 +701,10 @@ class Project(CommonModel):
slug_name = slugify(unicode(self.name)).replace(u'-', u'_') slug_name = slugify(unicode(self.name)).replace(u'-', u'_')
self.local_path = u'_%d__%s' % (self.pk, slug_name) self.local_path = u'_%d__%s' % (self.pk, slug_name)
self.save(update_fields=['local_path']) self.save(update_fields=['local_path'])
# If we just created a new project with SCM and it doesn't require any
# passwords to update, start the initial update.
if new_instance and self.scm_type and not self.scm_passwords_needed:
self.update()
@property @property
def needs_scm_password(self): def needs_scm_password(self):

18
awx/main/tests/projects.py
View File

@@ -663,10 +663,14 @@ class ProjectUpdatesTest(BaseTransactionTest):
def check_project_scm(self, project): def check_project_scm(self, project):
project_path = project.get_project_path(check_if_exists=False) project_path = project.get_project_path(check_if_exists=False)
# Initial checkout. # If project could be auto-updated on creation, the project dir should
self.assertFalse(os.path.exists(project_path)) # already exist, otherwise run an initial checkout.
self.check_project_update(project) if project.scm_type and not project.scm_passwords_needed:
self.assertTrue(os.path.exists(project_path)) self.assertTrue(os.path.exists(project_path))
else:
self.assertFalse(os.path.exists(project_path))
self.check_project_update(project)
self.assertTrue(os.path.exists(project_path))
# Stick a new untracked file in the project. # Stick a new untracked file in the project.
untracked_path = os.path.join(project_path, 'yadayada.txt') untracked_path = os.path.join(project_path, 'yadayada.txt')
self.assertFalse(os.path.exists(untracked_path)) self.assertFalse(os.path.exists(untracked_path))
@@ -961,8 +965,10 @@ class ProjectUpdatesTest(BaseTransactionTest):
scm_url=scm_url, scm_url=scm_url,
scm_update_on_launch=True, scm_update_on_launch=True,
) )
self.check_project_update(self.project) # First update triggered by saving a new project with SCM.
self.assertEqual(self.project.project_updates.count(), 1) self.assertEqual(self.project.project_updates.count(), 1)
self.check_project_update(self.project)
self.assertEqual(self.project.project_updates.count(), 2)
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)
self.assertEqual(job.status, 'new') self.assertEqual(job.status, 'new')
@@ -971,7 +977,7 @@ class ProjectUpdatesTest(BaseTransactionTest):
self.assertEqual(job.status, 'pending') self.assertEqual(job.status, 'pending')
job = Job.objects.get(pk=job.pk) job = Job.objects.get(pk=job.pk)
self.assertTrue(job.status in ('successful', 'failed')) self.assertTrue(job.status in ('successful', 'failed'))
self.assertEqual(self.project.project_updates.count(), 2) self.assertEqual(self.project.project_updates.count(), 3)
def test_update_on_launch_with_project_passwords(self): def test_update_on_launch_with_project_passwords(self):
scm_url = getattr(settings, 'TEST_GIT_PRIVATE_HTTPS', '') scm_url = getattr(settings, 'TEST_GIT_PRIVATE_HTTPS', '')