Merge pull request #2100 from cgwalters/make-install-kola-tests

ci: Install kola tests
This commit is contained in:
OpenShift Merge Robot 2020-05-15 14:38:00 -07:00 committed by GitHub
commit b5e51d8c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 0 deletions

View File

@ -76,6 +76,9 @@ parallel fcos: {
rmdir insttree
coreos-assembler fetch
coreos-assembler build
# Install the tests, then be sure they're not run again
make -C tests/kola install
rm tests/kola -rf
""")
}
fcosKola(cosaDir: "${env.WORKSPACE}")

View File

@ -456,3 +456,10 @@ else
endif
INSTALL_DATA_HOOKS += install-installed-tests-extra
endif
# Just forward these
build-kola-tests:
$(MAKE) -C tests/kola
install-kola-tests:
$(MAKE) -C tests/kola install

13
tests/kola/Makefile Normal file
View File

@ -0,0 +1,13 @@
DESTDIR ?=
TESTDIRS := $(shell find -mindepth 1 -maxdepth 1 -type d)
LIBSCRIPTS := $(shell ls *.sh)
KOLA_TESTDIR = $(DESTDIR)/usr/lib/coreos-assembler/tests/kola/ostree/
all:
for x in $(LIBSCRIPTS); do bash -n "$${x}"; done
install:
install -D -m 0644 -t $(KOLA_TESTDIR) $(LIBSCRIPTS)
for x in $(TESTDIRS); do rsync -rlv ./$${x} $(KOLA_TESTDIR)/; done