Skip to content

Commit

Permalink
ci: Install kola tests
Browse files Browse the repository at this point in the history
This builds on
coreos/coreos-assembler#1441
to install our tests rather than running them from the source
directory.  This model will more cleanly allow us to ship
our tests along with a test container or elsewhere, separate
from the source directory.

Also prep for ostreedev#2048
  • Loading branch information
cgwalters committed May 14, 2020
1 parent f145d18 commit 7a51d7a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .cci.jenkinsfile
Expand Up @@ -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}")
Expand Down
7 changes: 7 additions & 0 deletions Makefile-tests.am
Expand Up @@ -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 changes: 13 additions & 0 deletions tests/kola/Makefile
@@ -0,0 +1,13 @@
DESTDIR ?=

TESTDIRS := destructive nondestructive
SCRIPTS := $(shell ls *.sh)

KOLA_TESTDIR = $(DESTDIR)/usr/lib/coreos-assembler/tests/kola/ostree/

all:
for x in $(SCRIPTS); do bash -n "$${x}"; done

install:
install -D -t $(KOLA_TESTDIR) $(SCRIPTS)
for x in $(TESTDIRS); do rsync -rlv ./$${x} $(KOLA_TESTDIR)/; done

0 comments on commit 7a51d7a

Please sign in to comment.