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.
This commit is contained in:
Colin Walters 2020-05-23 14:34:57 +00:00 committed by OpenShift Merge Robot
parent 2e5402bd91
commit 75ae584e6d
4 changed files with 15 additions and 1 deletions

View File

@ -76,6 +76,8 @@ parallel insttests: {
shwrap("ci/installdeps.sh")
}
stage("Kola") {
// TODO upstream this into coreos-ci-lib
shwrap("make -C tests/kolainst install")
fcosKola(cosaDir: "${env.WORKSPACE}", extraArgs: "ext.*", parallel: nhosts)
}
stage("vmcheck") {

View File

@ -1 +0,0 @@
../../common

13
tests/kolainst/Makefile Normal file
View File

@ -0,0 +1,13 @@
DESTDIR ?=
TESTDIRS := $(shell find -mindepth 1 -maxdepth 1 -type d)
KOLA_TESTDIR = $(DESTDIR)/usr/lib/coreos-assembler/tests/kola/rpm-ostree/
all:
@echo "No build step"
install:
install -d -m 0755 $(KOLA_TESTDIR)
rsync -prlv ./nondestructive $(KOLA_TESTDIR)/
rsync -prlv ../common/ $(KOLA_TESTDIR)/nondestructive/data