almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
pull from: a8_updated
merge into: almalinux:a8
Conversation 0 Commits 158 Files Changed 128 +17 -75
2 changed files with 17 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c5cdd498ac - Show all commits

69
pungi/wrappers/scm.py
View File

@ -19,9 +19,7 @@ from __future__ import absolute_import
import os import os
import shutil import shutil
import glob import glob
import threading
import six import six
import tempfile
from six.moves import shlex_quote from six.moves import shlex_quote
from six.moves.urllib.request import urlretrieve from six.moves.urllib.request import urlretrieve
from fnmatch import fnmatch from fnmatch import fnmatch
@ -31,8 +29,6 @@ from kobo.shortcuts import run, force_list
from pungi.util import explode_rpm_package, makedirs, copy_all, temp_dir, retry from pungi.util import explode_rpm_package, makedirs, copy_all, temp_dir, retry
from .kojiwrapper import KojiWrapper from .kojiwrapper import KojiWrapper
scm_lock = threading.Lock()
class ScmBase(kobo.log.LoggingBase): class ScmBase(kobo.log.LoggingBase):
def __init__(self, logger=None, command=None, compose=None): def __init__(self, logger=None, command=None, compose=None):
@ -376,33 +372,10 @@ def get_file_from_scm(scm_dict, target_path, compose=None):
scm = _get_wrapper(scm_type, logger=logger, command=command, compose=compose) scm = _get_wrapper(scm_type, logger=logger, command=command, compose=compose)
files_copied = [] files_copied = []
branch = scm_branch if scm_branch else "master" for i in force_list(scm_file):
delete_after_flag = False with temp_dir(prefix="scm_checkout_") as tmp_dir:
with scm_lock: scm.export_file(scm_repo, i, scm_branch=scm_branch, target_dir=tmp_dir)
if compose and scm_repo: files_copied += copy_all(tmp_dir, target_path)
repo = scm_repo.rsplit("/")[-1]
tmp_dir = compose.paths.work.tmp_dir()
tmp_dir = os.path.join(tmp_dir, repo, branch)
else:
tmp_dir = tempfile.mkdtemp(prefix="scm_checkout_")
delete_after_flag = True
if not os.path.isdir(tmp_dir):
makedirs(tmp_dir)
for i in force_list(scm_file):
# Check the files which are included with subdirectories
check_file = os.path.join(tmp_dir, i[i.rfind("/") + 1 :])
if (
type(scm_dict) is not dict
or command is not None
or not compose
or not os.path.isfile(check_file)
):
scm.export_file(scm_repo, i, scm_branch=scm_branch, target_dir=tmp_dir)
files_copied += copy_all(tmp_dir, target_path)
if delete_after_flag:
shutil.rmtree(tmp_dir)
return files_copied return files_copied
@ -486,34 +459,14 @@ def get_dir_from_scm(scm_dict, target_path, compose=None):
logger = compose._logger if compose else None logger = compose._logger if compose else None
scm = _get_wrapper(scm_type, logger=logger, command=command, compose=compose) scm = _get_wrapper(scm_type, logger=logger, command=command, compose=compose)
branch = scm_branch if scm_branch else "master"
delete_after_flag = False
with scm_lock: with temp_dir(prefix="scm_checkout_") as tmp_dir:
if compose and scm_repo: scm.export_dir(scm_repo, scm_dir, scm_branch=scm_branch, target_dir=tmp_dir)
repo = scm_repo.rsplit("/")[-1]
tmp_dir = compose.paths.work.tmp_dir()
tmp_dir = os.path.join(tmp_dir, repo, branch)
else:
tmp_dir = tempfile.mkdtemp(prefix="scm_checkout_")
delete_after_flag = True
if not os.path.isdir(tmp_dir):
makedirs(tmp_dir)
scm.export_dir(scm_repo, scm_dir, scm_branch=scm_branch, target_dir=tmp_dir)
elif (
type(scm_dict) is not dict
or command is not None
or not scm_repo
or not compose
):
scm.export_dir(scm_repo, scm_dir, scm_branch=scm_branch, target_dir=tmp_dir)
files_copied = copy_all(tmp_dir, target_path) files_copied = copy_all(tmp_dir, target_path)
# Make sure the directory has permissions set to 755. This is a workaround # Make sure the directory has permissions set to 755. This is a workaround
# for a problem where sometimes the directory will be 700 and it will not # for a problem where sometimes the directory will be 700 and it will not
# be accessible via httpd. # be accessible via httpd.
os.chmod(target_path, 0o755) os.chmod(target_path, 0o755)
if delete_after_flag:
shutil.rmtree(tmp_dir)
return files_copied return files_copied

23
tests/test_scm.py
View File

@ -16,17 +16,14 @@ import six
from pungi.wrappers import scm from pungi.wrappers import scm
from tests.helpers import touch from tests.helpers import touch
from kobo.shortcuts import run from kobo.shortcuts import run
from pungi.compose import Compose
class SCMBaseTest(unittest.TestCase): class SCMBaseTest(unittest.TestCase):
def setUp(self): def setUp(self):
self.destdir = tempfile.mkdtemp() self.destdir = tempfile.mkdtemp()
self.tmp_dir = tempfile.mkdtemp()
def tearDown(self): def tearDown(self):
shutil.rmtree(self.destdir) shutil.rmtree(self.destdir)
shutil.rmtree(self.tmp_dir)
def assertStructure(self, returned, expected): def assertStructure(self, returned, expected):
# Check we returned the correct files # Check we returned the correct files
@ -146,8 +143,7 @@ class GitSCMTestCase(SCMBaseTest):
@mock.patch("pungi.wrappers.scm.run") @mock.patch("pungi.wrappers.scm.run")
def test_get_file_function(self, run): def test_get_file_function(self, run):
with mock.patch("pungi.compose.ComposeInfo"): compose = mock.Mock(conf={})
compose = Compose({}, self.tmp_dir)
def process(cmd, workdir=None, **kwargs): def process(cmd, workdir=None, **kwargs):
touch(os.path.join(workdir, "some_file.txt")) touch(os.path.join(workdir, "some_file.txt"))
@ -342,8 +338,6 @@ class GitSCMTestCaseReal(SCMBaseTest):
shutil.rmtree(self.gitRepositoryLocation) shutil.rmtree(self.gitRepositoryLocation)
def test_get_file_function(self): def test_get_file_function(self):
with mock.patch("pungi.compose.ComposeInfo"):
compose = Compose({}, self.tmp_dir)
sourceFileLocation = random.choice(list(self.files.keys())) sourceFileLocation = random.choice(list(self.files.keys()))
sourceFilename = os.path.basename(sourceFileLocation) sourceFilename = os.path.basename(sourceFileLocation)
destinationFileLocation = os.path.join(self.destdir, "other_file.txt") destinationFileLocation = os.path.join(self.destdir, "other_file.txt")
@ -354,7 +348,7 @@ class GitSCMTestCaseReal(SCMBaseTest):
"file": sourceFilename, "file": sourceFilename,
}, },
os.path.join(self.destdir, destinationFileLocation), os.path.join(self.destdir, destinationFileLocation),
compose=compose, compose=self.compose,
) )
self.assertEqual(destinationFileActualLocation, destinationFileLocation) self.assertEqual(destinationFileActualLocation, destinationFileLocation)
self.assertTrue(os.path.isfile(destinationFileActualLocation)) self.assertTrue(os.path.isfile(destinationFileActualLocation))
@ -367,8 +361,6 @@ class GitSCMTestCaseReal(SCMBaseTest):
self.assertEqual(sourceFileContent, destinationFileContent) self.assertEqual(sourceFileContent, destinationFileContent)
def test_get_file_function_with_overwrite(self): def test_get_file_function_with_overwrite(self):
with mock.patch("pungi.compose.ComposeInfo"):
compose = Compose({}, self.tmp_dir)
sourceFileLocation = random.choice(list(self.files.keys())) sourceFileLocation = random.choice(list(self.files.keys()))
sourceFilename = os.path.basename(sourceFileLocation) sourceFilename = os.path.basename(sourceFileLocation)
destinationFileLocation = os.path.join(self.destdir, "other_file.txt") destinationFileLocation = os.path.join(self.destdir, "other_file.txt")
@ -383,7 +375,7 @@ class GitSCMTestCaseReal(SCMBaseTest):
"file": sourceFilename, "file": sourceFilename,
}, },
os.path.join(self.destdir, destinationFileLocation), os.path.join(self.destdir, destinationFileLocation),
compose=compose, compose=self.compose,
overwrite=True, overwrite=True,
) )
self.assertEqual(destinationFileActualLocation, destinationFileLocation) self.assertEqual(destinationFileActualLocation, destinationFileLocation)
@ -611,8 +603,7 @@ class KojiSCMTestCase(SCMBaseTest):
@mock.patch("pungi.wrappers.scm.KojiWrapper") @mock.patch("pungi.wrappers.scm.KojiWrapper")
def test_doesnt_get_dirs(self, KW, dl): def test_doesnt_get_dirs(self, KW, dl):
with mock.patch("pungi.compose.ComposeInfo"): compose = mock.Mock(conf={"koji_profile": "koji"})
compose = Compose({"koji_profile": "koji"}, self.tmp_dir)
with self.assertRaises(RuntimeError) as ctx: with self.assertRaises(RuntimeError) as ctx:
scm.get_dir_from_scm( scm.get_dir_from_scm(
@ -637,8 +628,7 @@ class KojiSCMTestCase(SCMBaseTest):
@mock.patch("pungi.wrappers.scm.KojiWrapper") @mock.patch("pungi.wrappers.scm.KojiWrapper")
def test_get_from_build(self, KW, dl): def test_get_from_build(self, KW, dl):
with mock.patch("pungi.compose.ComposeInfo"): compose = mock.Mock(conf={"koji_profile": "koji"})
compose = Compose({"koji_profile": "koji"}, self.tmp_dir)
def download(src, dst): def download(src, dst):
touch(dst) touch(dst)
@ -669,8 +659,7 @@ class KojiSCMTestCase(SCMBaseTest):
@mock.patch("pungi.wrappers.scm.KojiWrapper") @mock.patch("pungi.wrappers.scm.KojiWrapper")
def test_get_from_latest_build(self, KW, dl): def test_get_from_latest_build(self, KW, dl):
with mock.patch("pungi.compose.ComposeInfo"): compose = mock.Mock(conf={"koji_profile": "koji"})
compose = Compose({"koji_profile": "koji"}, self.tmp_dir)
def download(src, dst): def download(src, dst):
touch(dst) touch(dst)