keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29440346f1
rpm-ostree/Makefile-tests.am

67 lines
2.1 KiB
Plaintext
Raw Normal View History

vmcheck: move vmbuild and vmoverlay to scripts That way we can make use of libvm instead of relying on vagrant. Closes: #394 Approved by: cgwalters
2016-07-15 20:34:47 +03:00
BASE_TESTS_ENVIRONMENT = \
tests: restructure dirs - Move all the uninstalled, non-destructive tests to check/ - Add a README - Move utilities to utils/ - Move common files to common/ Closes: #304 Approved by: cgwalters
2016-06-06 19:46:48 +03:00
builddir=$(abs_builddir) \
topsrcdir=$(abs_top_srcdir) \
commondir=$(abs_top_srcdir)/tests/common
tests: Add test coverage for rpm-ostree container
2016-02-10 13:42:57 +03:00
vmcheck: move vmbuild and vmoverlay to scripts That way we can make use of libvm instead of relying on vagrant. Closes: #394 Approved by: cgwalters
2016-07-15 20:34:47 +03:00
AM_TESTS_ENVIRONMENT = \
UNINSTALLEDTESTS=1 \
$(BASE_TESTS_ENVIRONMENT)
Update for libhif -> libdnf Still not many PRs outstanding, so it's a good time to take this plunge. Mostly automated via `sed`. Closes: #416 Approved by: Conan-Kudo
2016-08-03 21:30:17 +03:00
# we consume libdnf as a submodule, but we may not have installed it yet (and we
tests: use our self-built libhif library Tests were failing because we were silently falling back to the system libhif, which, as of PR #158, changed a string from non-const to const, which meant we were double free-ing strings. Closes: #373 Approved by: cgwalters
2016-07-04 22:42:31 +03:00
# don't want it to fall back to the system libhif if it's also installed)
AM_TESTS_ENVIRONMENT += \
lib: Expose new API around basearch For https://pagure.io/atomic-wg/issue/299 we need to make it more convenient to substitute the architecture in an installation context. I plan to use this API inside `rpmostreepayload` in Anaconda, so we can substitute the same value of `${basearch}` we use in treefiles since https://github.com/projectatomic/rpm-ostree/pull/305 Now, you might wonder - why do we need an API wrapping libdnf? It's because libdnf is not API stable yet. We're just exposing a tiny subset. In theory we could use the Python dnf bindings in Anaconda, but things get slightly weird if rpmostreepayload depends on dnf. Perhaps we'll do that down the road, but for now this a small API surface to maintain (forever). This change reworks the internal `varsubst` bits to take a pure `DnfContext`, since we don't want to spin up a whole `RpmOstreeContext` just to do some string substitutions. Closes: #877 Approved by: jlebon
2017-07-13 23:39:01 +03:00
LD_LIBRARY_PATH=$(abs_builddir)/libdnf-build/libdnf:$$(cd $(top_builddir)/.libs && pwd)$${LD_LIBRARY_PATH:+:$${LD_LIBRARY_PATH}} \
GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH} \
tests: use our self-built libhif library Tests were failing because we were silently falling back to the system libhif, which, as of PR #158, changed a string from non-const to const, which meant we were double free-ing strings. Closes: #373 Approved by: cgwalters
2016-07-04 22:42:31 +03:00
$(NULL)
tests: Disable ASAN leak checks Right now we're far from leak free, and I want to use ASAN as a sanity checker, not a leak checker. Closes: #576 Approved by: jlebon
2017-01-17 21:29:48 +03:00
if BUILDOPT_ASAN
tests: Skip running introspection tests if built with ASAN This is the rpm-ostree equivalent of <https://github.com/ostreedev/ostree/commit/47b4dd1b38e422254afa67756873957c25aeab6d> Unfortunately, introspection uses `dlopen(), which doesn't quite work when the DSO is compiled with ASAN but the outer executable isn't. Prep for syncing PAPR config with ostree. Closes: #1000 Approved by: jlebon
2017-09-21 23:59:28 +03:00
AM_TESTS_ENVIRONMENT += BUILDOPT_ASAN=yes ASAN_OPTIONS=detect_leaks=false
tests: Disable ASAN leak checks Right now we're far from leak free, and I want to use ASAN as a sanity checker, not a leak checker. Closes: #576 Approved by: jlebon
2017-01-17 21:29:48 +03:00
endif
tests: use our self-built libhif library Tests were failing because we were silently falling back to the system libhif, which, as of PR #158, changed a string from non-const to const, which meant we were double free-ing strings. Closes: #373 Approved by: cgwalters
2016-07-04 22:42:31 +03:00
ci: Drop tests/vmcheck/image.qcow2, use COSA_DIR/.cosa Now that `cosa build-fast` writes to `.cosa`, teach our test suite to pick that up by default. We don't anymore support non-CoreOS (i.e. non-Ignition) hosts for our test suite, so making this more CoreOS specific is fine. Then use the "standard" COSA_DIR as a way to find the target cosa dir in the e2e CI.
2021-02-23 23:47:53 +03:00
GITIGNOREFILES += ssh-config vmcheck-logs/ test-compose-logs/ .cosa/
tests: Dip our toes into using Ansible This adds a shell primitive to make it easy to execute a playbook task list. The big picture idea is to sync with https://github.com/ostreedev/ostree/pull/1462 and rewrite some of the libvm shell stuff as playbooks, allowing easier code sharing with a-h-t and just in general being a better library for talking ssh and executing commnads. Closes: #1297 Approved by: jlebon
2018-03-08 23:56:05 +03:00
tests: no longer use installed tests For now, we don't remove the ability to install tests (e.g. the necessary blurbs in glib-tap.mk are still there), but we take out all our previously installed tests from the list. All the previously installed tests are then converted to work uninstalled. This also allows us to do some simplifications in the test cases. Also do some cleanups in the Makefile to improve legibility. Closes: #304 Approved by: cgwalters
2016-06-06 19:08:29 +03:00
uninstalled_test_scripts = \
tests/jsonutil: New test Adding some basic coverage of the json parsing.
2014-12-18 04:26:31 +03:00
$(NULL)
make check: add note to run installed tests Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-03-28 15:47:25 +03:00
Initial support for automatic updates This patch introduces a new `AutomaticUpdatePolicy` configuration. This was a long time coming for rpm-ostree, given that its update model makes it extremely apt for such a feature. The config supports a `check` mode, which should be very useful to Atomic Workstation users, as well as a `reboot` mode, which could be used in its present form in simple single node Atomic Host situations. There is still a lot of work to be done, including integrating advisories, and supporting a `deploy` mode. This feature hopefully will be leveraged as well by higher-level projects like GNOME Software and Cockpit. Closes: #1147 Approved by: cgwalters
2017-12-15 20:01:46 +03:00
uninstalled_test_extra_programs = \
dbus-run-session \
$(NULL)
tests: Add test coverage for rpm-ostree container
2016-02-10 13:42:57 +03:00
tests: restructure dirs - Move all the uninstalled, non-destructive tests to check/ - Add a README - Move utilities to utils/ - Move common files to common/ Closes: #304 Approved by: cgwalters
2016-06-06 19:46:48 +03:00
dbus_run_session_SOURCES = tests/utils/dbus-run-session.c
tests: Import dbus-run-session Unfortunately RHEL 7 has an older version of dbus, and I use it as a workstation. It's not a lot of code and only used for tests. We can make it build time conditional down the line or something.
2015-09-08 18:06:25 +03:00
tests: transition to build_rpm Nuke all the previous goop that was used to create RPMs at `make check` time and transition all the tests to use the new `build_rpm` function. It definitely feels cleaner to use. It's also really nice to have the spec live in the same file as the test that uses it. Closes: #854 Approved by: cgwalters
2017-06-29 17:11:25 +03:00
check-local:
make check: add note to run installed tests Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-03-28 15:47:25 +03:00
@echo " *** NOTE ***"
ci: Drop tests/vmcheck/image.qcow2, use COSA_DIR/.cosa Now that `cosa build-fast` writes to `.cosa`, teach our test suite to pick that up by default. We don't anymore support non-CoreOS (i.e. non-Ignition) hosts for our test suite, so making this more CoreOS specific is fine. Then use the "standard" COSA_DIR as a way to find the target cosa dir in the e2e CI.
2021-02-23 23:47:53 +03:00
@echo " \"make check\" only runs unit tests, which have limited coverage currently."
@echo " See HACKING.md for more information about VM-based integration testing."
make check: add note to run installed tests Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-03-28 15:47:25 +03:00
@echo " *** NOTE ***"
Makefile-tests.am: add helper testenv target The 'testenv' target enters an environment in which a tmpdir is created and the daemon is set up and started. This is useful for easy testing. $ make -j4 && make install $ make testenv ===== ENTERING TESTENV ===== $ # now we can easily test our new code $ # we can even make use of helper funcs $ source ../tests/libtest.sh $ setup_os_repository archive-z2 syslinux $ exit ===== EXITING TESTENV =====
2016-02-26 19:31:33 +03:00
hacking: make it easier to use a custom tree Let's make using a custom install tree easier and document the process. We split out the insttree step into `build.sh` so that we no longer have to `flock(1)` around it, and also share between `overlay.sh` and `sync.sh`. Closes: #968 Approved by: cgwalters
2017-09-01 20:33:36 +03:00
.PHONY: vmsync vmoverlay vmcheck testenv
Makefile-tests: add toplevel vm* targets The `make vmshell` target makes it even easier to immediately try out your changes in a live running Atomic Host. It will automatically provision the VM, sync your latest changes, build, install in a new deployment onto which the VM is rebooted, and drop you in the shell. Closes: #321 Approved by: cgwalters
2016-06-15 00:12:17 +03:00
hacking: make it easier to use a custom tree Let's make using a custom install tree easier and document the process. We split out the insttree step into `build.sh` so that we no longer have to `flock(1)` around it, and also share between `overlay.sh` and `sync.sh`. Closes: #968 Approved by: cgwalters
2017-09-01 20:33:36 +03:00
vmsync:
tests: Correctly error out if some part of install.sh fails It took me way, way, way too long to debug that my dev container somehow missing `ostree-grub2` caused the script to fail early, but we'd still continue trying to sync, leading to us not actually changing the installed `rpm-ostree` binary, leading to test suite failures. Also add the chmod hammer at the top so we can delete even if we fail after doing an rsync. Closes: #1115 Approved by: jlebon
2017-11-29 01:02:23 +03:00
@set -e; if [ -z "$(SKIP_INSTALL)" ]; then \
Makefile-tests.am: actually support SKIP_INSTALL This was supposed to be part of #968. `HACKING.md` already refers to a `SKIP_INSTALL` variable, which basically ensures that we use the install tree as-is. Closes: #1032 Approved by: cgwalters
2017-09-30 23:29:38 +03:00
env $(BASE_TESTS_ENVIRONMENT) ./tests/vmcheck/install.sh; \
fi; \
hacking: make it easier to use a custom tree Let's make using a custom install tree easier and document the process. We split out the insttree step into `build.sh` so that we no longer have to `flock(1)` around it, and also share between `overlay.sh` and `sync.sh`. Closes: #968 Approved by: cgwalters
2017-09-01 20:33:36 +03:00
env $(BASE_TESTS_ENVIRONMENT) ./tests/vmcheck/sync.sh
tests: Add hidden `testutils` subcommand This is a hack to allow using `inject-pkglist` without having to build the tree first. Higher-level, I think we can split this back out again if we have a `-tests` subpackage where we ship the vmcheck testsuite.
2019-12-13 20:19:56 +03:00
vmoverlay:
Rework vmcheck to use `kola spawn`, move off of PAPR There's a lot going on here, but essentially: 1. We change the `vmcheck` model so that it always operates on an immutable base image. It takes that image and dynamically launches a separate VM for each test using `kola spawn`. This means we can drop a lot of hacks around re-using the same VMs. 2. Following from 1., `vmoverlay` now takes as input a base image, overlays the built rpm-ostree bits, then creates a new base image. Of course, we don't have to do this in CI, because we build FCOS with the freshly built RPMs (so it uses `SKIP_VMOVERLAY=1`). `vmoverlay` then will be more for the developer case where one doesn't want to iterate via `cosa build` to test rpm-ostree changes. I say "will" because the functionality doesn't exist yet; I'd like to enhance `cosa dev-overlay` to do this. (Note `vmsync` should still works just as before too.) 3. `vmcheck` can be run without building the tree first, as `tests/vmcheck.sh`. The `make vmcheck` target still exists though for finger compatibility and better meshing with `vmoverlay` in the developer case. What's really nice about using kola spawn is that it takes care of a lot of things for us, such as the qemu command, journal and console gathering, and SSH. Similarly to the compose testsuites, we're using parallel here to run multiple vmcheck tests at once. (On developer laptops, we cap parallelism at `$(nproc) - 1`).
2019-12-13 20:23:41 +03:00
@set -e; \
if [ -z "$(SKIP_INSTALL)" ] && [ -z "$(SKIP_VMOVERLAY)" ]; then \
env $(BASE_TESTS_ENVIRONMENT) ./tests/vmcheck/install.sh; \
fi; \
env $(BASE_TESTS_ENVIRONMENT) ./tests/vmcheck/overlay.sh;
# One can run the vmcheck.sh script directly. The make target is useful for local
# development so that e.g. we automatically overlay.
tests: transition to build_rpm Nuke all the previous goop that was used to create RPMs at `make check` time and transition all the tests to use the new `build_rpm` function. It definitely feels cleaner to use. It's also really nice to have the spec live in the same file as the test that uses it. Closes: #854 Approved by: cgwalters
2017-06-29 17:11:25 +03:00
vmcheck: vmoverlay
Rework vmcheck to use `kola spawn`, move off of PAPR There's a lot going on here, but essentially: 1. We change the `vmcheck` model so that it always operates on an immutable base image. It takes that image and dynamically launches a separate VM for each test using `kola spawn`. This means we can drop a lot of hacks around re-using the same VMs. 2. Following from 1., `vmoverlay` now takes as input a base image, overlays the built rpm-ostree bits, then creates a new base image. Of course, we don't have to do this in CI, because we build FCOS with the freshly built RPMs (so it uses `SKIP_VMOVERLAY=1`). `vmoverlay` then will be more for the developer case where one doesn't want to iterate via `cosa build` to test rpm-ostree changes. I say "will" because the functionality doesn't exist yet; I'd like to enhance `cosa dev-overlay` to do this. (Note `vmsync` should still works just as before too.) 3. `vmcheck` can be run without building the tree first, as `tests/vmcheck.sh`. The `make vmcheck` target still exists though for finger compatibility and better meshing with `vmoverlay` in the developer case. What's really nice about using kola spawn is that it takes care of a lot of things for us, such as the qemu command, journal and console gathering, and SSH. Similarly to the compose testsuites, we're using parallel here to run multiple vmcheck tests at once. (On developer laptops, we cap parallelism at `$(nproc) - 1`).
2019-12-13 20:23:41 +03:00
@tests/vmcheck.sh
vmcheck: add a basic test harness This is a very simple test harness inspired by the atomic one. It's a simple bash script that sets up a permanent ssh connection to the host and runs the test scripts. Also add a "demo" test-basic.sh test to make sure that it works. Closes: #344 Approved by: cgwalters
2016-06-21 19:37:02 +03:00
Makefile-tests.am: add helper testenv target The 'testenv' target enters an environment in which a tmpdir is created and the daemon is set up and started. This is useful for easy testing. $ make -j4 && make install $ make testenv ===== ENTERING TESTENV ===== $ # now we can easily test our new code $ # we can even make use of helper funcs $ source ../tests/libtest.sh $ setup_os_repository archive-z2 syslinux $ exit ===== EXITING TESTENV =====
2016-02-26 19:31:33 +03:00
testenv:
@echo "===== ENTERING TESTENV ====="
test_tmpdir=$$(mktemp -d test.XXXXXX) && \
cd $$test_tmpdir && \
testenv: add builddir to PATH Closes: #434 Approved by: cgwalters
2016-08-18 00:03:54 +03:00
env $(BASE_TESTS_ENVIRONMENT) PATH=$(abs_builddir):$$PATH TESTENV=1 \
testenv: include same vars as real test environment Closes: #325 Approved by: cgwalters
2016-06-15 23:02:36 +03:00
sh ../tests/utils/setup-session.sh bash && \
Makefile-tests.am: add helper testenv target The 'testenv' target enters an environment in which a tmpdir is created and the daemon is set up and started. This is useful for easy testing. $ make -j4 && make install $ make testenv ===== ENTERING TESTENV ===== $ # now we can easily test our new code $ # we can even make use of helper funcs $ source ../tests/libtest.sh $ setup_os_repository archive-z2 syslinux $ exit ===== EXITING TESTENV =====
2016-02-26 19:31:33 +03:00
cd .. && \
rm -rf $$test_tmpdir
@echo "===== LEAVING TESTENV ====="
Reference in New Issue Copy Permalink