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

Fix migration through manual testing

Browse Source
This commit is contained in:
AlanCoding
2020-05-14 16:05:21 -04:00
parent b6a4c34b7a
commit 3c8c1858d4
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/migrations/_inventory_source.py
View File

@@ -3,6 +3,7 @@ import logging
from uuid import uuid4 from uuid import uuid4
from django.utils.encoding import smart_text from django.utils.encoding import smart_text
from django.utils.timezone import now
from awx.main.utils.common import parse_yaml_or_json from awx.main.utils.common import parse_yaml_or_json
@@ -99,20 +100,25 @@ def create_scm_script_substitute(apps, source):
# it can still be updated manually later (but staying within 2.9 branch), if desired # it can still be updated manually later (but staying within 2.9 branch), if desired
ansible_rev = '6f83b9aff42331e15c55a171de0a8b001208c18c' ansible_rev = '6f83b9aff42331e15c55a171de0a8b001208c18c'
InventorySource = apps.get_model('main', 'InventorySource') InventorySource = apps.get_model('main', 'InventorySource')
ContentType = apps.get_model('contenttypes', 'ContentType')
Project = apps.get_model('main', 'Project') Project = apps.get_model('main', 'Project')
if not InventorySource.objects.filter(source=source).exists(): if not InventorySource.objects.filter(source=source).exists():
logger.debug('No sources of type {} to migrate'.format(source)) logger.debug('No sources of type {} to migrate'.format(source))
return return
proj_name = 'Replacement project for {} type sources - {}'.format(source, uuid4()) proj_name = 'Replacement project for {} type sources - {}'.format(source, uuid4())
project = Project( right_now = now()
project = Project.objects.create(
name=proj_name, name=proj_name,
created=right_now,
modified=right_now,
description='Created by migration', description='Created by migration',
polymorphic_ctype=ContentType.objects.get(model='project'),
# project-specific fields
scm_type='git', scm_type='git',
scm_url='https://github.com/ansible/ansible.git', scm_url='https://github.com/ansible/ansible.git',
scm_branch='stable-2.9', scm_branch='stable-2.9',
scm_revision=ansible_rev scm_revision=ansible_rev
) )
project.save(skip_update=True)
ct = 0 ct = 0
for inv_src in InventorySource.objects.filter(source=source).iterator(): for inv_src in InventorySource.objects.filter(source=source).iterator():
inv_src.source = 'scm' inv_src.source = 'scm'

6
awx/main/tasks.py
View File

@@ -2281,7 +2281,11 @@ class RunProjectUpdate(BaseTask):
def acquire_lock(self, instance, blocking=True): def acquire_lock(self, instance, blocking=True):
lock_path = instance.get_lock_file() lock_path = instance.get_lock_file()
if lock_path is None: if lock_path is None:
raise RuntimeError(u'Invalid lock file path') # If from migration or someone blanked local_path for any other reason, recoverable by save
instance.save()
lock_path = instance.get_lock_file()
if lock_path is None:
raise RuntimeError(u'Invalid lock file path')
try: try:
self.lock_fd = os.open(lock_path, os.O_RDWR | os.O_CREAT) self.lock_fd = os.open(lock_path, os.O_RDWR | os.O_CREAT)