forked from Mirror/pmbootstrap
51bdc24315
TLDR: Always rebuild/install packages when something changed when executing "pmbootstrap install/initfs/flash", more speed in dependency resolution. --- pmbootstrap has already gotten some support for "timestamp based rebuilds", which modifies the logic for when packages should be rebuilt. It doesn't only consider packages outdated with old pkgver/pkgrel combinations, but also packages, where a source file has a newer timestamp, than the built package has. I've found out, that this can lead to more rebuilds than expected. For example, when you check out the pmbootstrap git repository again into another folder, although you have already built packages. Then all files have the timestamp of the checkout, and the packages will appear to be outdated. While this is not largely a concern now, this will become a problem once we have a binary package repository, because then the packages from the binary repo will always seem to be outdated, if you just freshly checked out the repository. To combat this, git gets asked if the files from the aport we're looking at are in sync with upstream, or not. Only when the files are not in sync with upstream and the timestamps of the sources are newer, a rebuild gets triggered from now on. In case this logic should fail, I've added an option during "pmbootstrap init" where you can enable or disable the "timestamp based rebuilds" option. In addition to that, this commit also works on fixing #120: packages do not get updated in "pmbootstrap install" after they have been rebuilt. For this to work, we specify all packages explicitly for abuild, instead of letting abuild do the resolving. This feature will also work with the "timestamp based rebuilds". This commit also fixes the working_dir argument in pmb.helpers.run.user, which was simply ignored before. Finally, the performance of the dependency resolution is faster again (when compared to the current version in master), because the parsed apkbuilds and finding the aport by pkgname gets cached during one pmbootstrap call (in args.cache, which also makes it easy to put fake data there in testcases). The new dependency resolution code can output lots of verbose messages for debugging by specifying the `-v` parameter. The meaning of that changed, it used to output the file names where log messages come from, but no one seemed to use that anyway.
121 lines
3.6 KiB
Python
121 lines
3.6 KiB
Python
"""
|
|
Copyright 2017 Oliver Smith
|
|
|
|
This file is part of pmbootstrap.
|
|
|
|
pmbootstrap is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
pmbootstrap is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with pmbootstrap. If not, see <http://www.gnu.org/licenses/>.
|
|
"""
|
|
import os
|
|
import sys
|
|
import pytest
|
|
import types
|
|
import time
|
|
|
|
# Import from parent directory
|
|
pmb_src = os.path.abspath(os.path.join(os.path.dirname(__file__) + "/.."))
|
|
sys.path.append(pmb_src)
|
|
import pmb.build.package
|
|
import pmb.helpers.logging
|
|
import pmb.helpers.repo
|
|
|
|
|
|
@pytest.fixture
|
|
def args(request):
|
|
import pmb.parse
|
|
sys.argv = ["pmbootstrap.py", "chroot"]
|
|
args = pmb.parse.arguments()
|
|
args.log = args.work + "/log_testsuite.txt"
|
|
pmb.helpers.logging.init(args)
|
|
request.addfinalizer(args.logfd.close)
|
|
return args
|
|
|
|
|
|
@pytest.fixture
|
|
def args_fake_work_dir(request, tmpdir):
|
|
args = types.SimpleNamespace()
|
|
args.work = str(tmpdir)
|
|
return args
|
|
|
|
|
|
def clear_timestamps_from_files(files):
|
|
"""
|
|
Replace all last modified timestamps from pmb.helpers.repo.files() with
|
|
None. The files-parameter gets changed in place.
|
|
"""
|
|
for arch in files.keys():
|
|
for file in files[arch].keys():
|
|
files[arch][file] = None
|
|
|
|
|
|
def test_files_empty(args_fake_work_dir):
|
|
args = args_fake_work_dir
|
|
os.mkdir(args.work + "/packages")
|
|
assert pmb.helpers.repo.files(args) == {}
|
|
|
|
|
|
def test_files_not_empty(args_fake_work_dir):
|
|
args = args_fake_work_dir
|
|
pkgs = args.work + "/packages"
|
|
for dir in ["", "armhf", "x86_64"]:
|
|
os.mkdir(pkgs + "/" + dir)
|
|
open(pkgs + "/x86_64/test", "a").close()
|
|
files = pmb.helpers.repo.files(args)
|
|
clear_timestamps_from_files(files)
|
|
assert files == {"armhf": {}, "x86_64": {"test": None}}
|
|
|
|
|
|
def test_files_diff(args_fake_work_dir):
|
|
args = args_fake_work_dir
|
|
# Create x86_64/test, x86_64/test2
|
|
pkgs = args.work + "/packages"
|
|
for dir in ["", "x86_64"]:
|
|
os.mkdir(pkgs + "/" + dir)
|
|
for file in ["x86_64/test", "x86_64/test2"]:
|
|
open(pkgs + "/" + file, "a").close()
|
|
|
|
# First snapshot
|
|
first = pmb.helpers.repo.files(args)
|
|
|
|
# Change: x86_64/test (set the lastmod timestamp 5 seconds in the future)
|
|
mtime_old = os.path.getmtime(pkgs + "/x86_64/test")
|
|
time_new = time.time() + 5
|
|
os.utime(pkgs + "/x86_64/test", (time_new, time_new))
|
|
mtime_new = os.path.getmtime(pkgs + "/x86_64/test")
|
|
assert mtime_old != mtime_new
|
|
|
|
# Create: aarch64/test3, x86_64/test4
|
|
os.mkdir(pkgs + "/aarch64")
|
|
open(pkgs + "/aarch64/test3", "a").close()
|
|
open(pkgs + "/x86_64/test4", "a").close()
|
|
|
|
diff = pmb.helpers.repo.diff(args, first)
|
|
assert diff == ["aarch64/test3", "x86_64/test", "x86_64/test4"]
|
|
|
|
|
|
def test_hash():
|
|
url = "https://nl.alpinelinux.org/alpine/edge/testing"
|
|
hash = "865a153c"
|
|
assert pmb.helpers.repo.hash(url, 8) == hash
|
|
|
|
|
|
def test_apkindex_files(args):
|
|
# Make sure, that we have a user's APKINDEX.tar.gz
|
|
pmb.build.package(args, "hello-world", args.arch_native)
|
|
|
|
files = pmb.helpers.repo.apkindex_files(args)
|
|
for file in files:
|
|
assert os.path.exists(file)
|
|
|
|
# Test cache
|
|
assert files == pmb.helpers.repo.apkindex_files(args)
|