diff --git a/.papr.sh b/.papr.sh index 9bb3a09..3ae3c46 100755 --- a/.papr.sh +++ b/.papr.sh @@ -8,7 +8,7 @@ if test -z "${INSIDE_CONTAINER:-}"; then # by default, the root LV on AH is only 3G, but we need a # bit more for our tests - lvresize -r -L +5G atomicos/root + lvresize -r -L +5G atomicos/root || true if grep -q ID=fedora /etc/os-release; then if [ ! -e /var/tmp/ostree-unlock-ovl.* ]; then @@ -43,7 +43,7 @@ if test -z "${INSIDE_CONTAINER:-}"; then --workdir /code \ -e INSIDE_CONTAINER=1 \ -e PYTHON=$PYTHON \ - registry.fedoraproject.org/fedora:26 /code/.papr.sh + registry.fedoraproject.org/fedora:27 /code/.papr.sh # run the testsuite on the host if [ -z ${NO_TEST} ]; then @@ -76,4 +76,7 @@ if [ -z ${NO_TEST} ]; then make pylint-check make test-python3-pylint fi + +rm -rf /host/usr/bin/atomic /host/usr/lib/python*/site-packages/Atomic + make PYTHON=$PYTHON PYLINT=true install DESTDIR=/host diff --git a/.papr.yml b/.papr.yml index 3cd5a19..3c3d6d3 100644 --- a/.papr.yml +++ b/.papr.yml @@ -4,11 +4,11 @@ branches: - try host: - distro: fedora/26/atomic + distro: fedora/27/atomic specs: secondary-disk: 10 -context: fedora/26/atomic +context: fedora/27/atomic required: true @@ -39,11 +39,11 @@ context: centos/7/atomic inherit: true host: - distro: fedora/26/cloud + distro: fedora/27/cloud specs: secondary-disk: 10 -context: fedora/26/cloud +context: fedora/27/cloud # we install atomic to get the runtime reqs but of course, # its files will get overwritten by the containerized build diff --git a/Makefile b/Makefile index fb7bcf7..4b7a426 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ clean: .PHONY: install-only install-only: - $(PYTHON) setup.py install --install-scripts /usr/share/atomic `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + $(PYTHON) setup.py install --prefix=/usr --install-scripts /usr/share/atomic `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` (cd $(DESTDIR)/$(PYTHONSITELIB) && rm -f atomic-$(VERSION)-*egg-info)