keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8ec0a3db12
rpm-ostree/tests/kolainst/Makefile

19 lines
548 B
Makefile
Raw Normal View History

tests/kola: Move into tests/kolainst, run installed Switch to the "installed" model introduced by: https://github.com/coreos/coreos-assembler/pull/1441 It's hard to support running tests *both* from the srcdir and installed; in this case because we have a symlink that needs to be followed, which kola knows how to do from the srcdir but not when installed. Let's establish a new convention of `tests/kolainst`. In our case we follow the symlink manually for now. That bit will be cleaned up when we eventually switch entirely to kola tests.
2020-05-23 17:34:57 +03:00
DESTDIR ?=
TESTDIRS := $(shell find -mindepth 1 -maxdepth 1 -type d)
KOLA_TESTDIR = $(DESTDIR)/usr/lib/coreos-assembler/tests/kola/rpm-ostree/
tests: Add RPMs to installed kola tests, port layering-local I'd like to get to the point where we drop the `vmcheck.sh`/`libvm.sh` stuff. Instead we use kola directly, and write our tests in a way that they default to run on the target, not on the host because it's *much* more natural to type e.g. `rpm-ostree upgrade` instead of `vm_rpmostree upgrade`. We'd done a bit of porting, but a blocker was that a lot of our tests dynamically generate RPMs and send them over. Instead, let's generate the RPMs ahead of time in a "build" step, then they all get passed at once via kola ext data. Add the concept of multiple repo versions too. Right now we only generate the one RPM needed for the `layering-local` test and port it.
2021-02-25 04:56:21 +03:00
rpm-repos: kolainst-build.sh
./kolainst-build.sh
tests/kola: Move into tests/kolainst, run installed Switch to the "installed" model introduced by: https://github.com/coreos/coreos-assembler/pull/1441 It's hard to support running tests *both* from the srcdir and installed; in this case because we have a symlink that needs to be followed, which kola knows how to do from the srcdir but not when installed. Let's establish a new convention of `tests/kolainst`. In our case we follow the symlink manually for now. That bit will be cleaned up when we eventually switch entirely to kola tests.
2020-05-23 17:34:57 +03:00
tests: Add RPMs to installed kola tests, port layering-local I'd like to get to the point where we drop the `vmcheck.sh`/`libvm.sh` stuff. Instead we use kola directly, and write our tests in a way that they default to run on the target, not on the host because it's *much* more natural to type e.g. `rpm-ostree upgrade` instead of `vm_rpmostree upgrade`. We'd done a bit of porting, but a blocker was that a lot of our tests dynamically generate RPMs and send them over. Instead, let's generate the RPMs ahead of time in a "build" step, then they all get passed at once via kola ext data. Add the concept of multiple repo versions too. Right now we only generate the one RPM needed for the `layering-local` test and port it.
2021-02-25 04:56:21 +03:00
all: rpm-repos
install: all
tests/kola: Move into tests/kolainst, run installed Switch to the "installed" model introduced by: https://github.com/coreos/coreos-assembler/pull/1441 It's hard to support running tests *both* from the srcdir and installed; in this case because we have a symlink that needs to be followed, which kola knows how to do from the srcdir but not when installed. Let's establish a new convention of `tests/kolainst`. In our case we follow the symlink manually for now. That bit will be cleaned up when we eventually switch entirely to kola tests.
2020-05-23 17:34:57 +03:00
install -d -m 0755 $(KOLA_TESTDIR)
rsync -prlv ./nondestructive $(KOLA_TESTDIR)/
Add new `ex initramfs-etc` command This command allows users to cheaply inject configuration files in the initramfs stage without having to regenerate the whole initramfs (or even a new OSTree commit). This will be useful for configuring services involved in bringing up the root block device. ``` $ echo 'hello world' > /etc/foobar $ rpm-ostree ex initramfs-etc --track /etc/foobar Staging deployment... done Run "systemctl reboot" to start a reboot $ rpm-ostree status State: idle Deployments: ostree://fedora:fedora/x86_64/coreos/testing-devel Version: 32.20200716.dev.1 (2020-07-16T02:47:29Z) Commit: 9a817d75bef81b955179be6e602d1e6ae350645b6323231a62ba2ee6e5b9644b GPGSignature: (unsigned) InitramfsEtc: /etc/foobar ● ostree://fedora:fedora/x86_64/coreos/testing-devel Version: 32.20200716.dev.1 (2020-07-16T02:47:29Z) Commit: 9a817d75bef81b955179be6e602d1e6ae350645b6323231a62ba2ee6e5b9644b GPGSignature: (unsigned) $ reboot (boot into rd.break) sh-5.0# cat /etc/foobar hello world ``` See the libostree side of this at: https://github.com/ostreedev/ostree/pull/2155 Lots more discussions in: https://github.com/coreos/fedora-coreos-tracker/issues/94 Closes: #1930
2020-07-25 00:35:01 +03:00
rsync -prlv ./destructive $(KOLA_TESTDIR)/
rsync -prlv ../common/*.sh $(KOLA_TESTDIR)/nondestructive/data/
rsync -prlv ../common/*.sh $(KOLA_TESTDIR)/destructive/data/
tests: Add RPMs to installed kola tests, port layering-local I'd like to get to the point where we drop the `vmcheck.sh`/`libvm.sh` stuff. Instead we use kola directly, and write our tests in a way that they default to run on the target, not on the host because it's *much* more natural to type e.g. `rpm-ostree upgrade` instead of `vm_rpmostree upgrade`. We'd done a bit of porting, but a blocker was that a lot of our tests dynamically generate RPMs and send them over. Instead, let's generate the RPMs ahead of time in a "build" step, then they all get passed at once via kola ext data. Add the concept of multiple repo versions too. Right now we only generate the one RPM needed for the `layering-local` test and port it.
2021-02-25 04:56:21 +03:00
rsync -prlv rpm-repos/ $(KOLA_TESTDIR)/destructive/data/rpm-repos/
Reference in New Issue Copy Permalink