Skip to content

tests/kola: Move into tests/kolainst, run installed #2106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
May 26, 2020
Merged

tests/kola: Move into tests/kolainst, run installed #2106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .cci.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
1 change: 0 additions & 1 deletion tests/kola/nondestructive/data
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions tests/kolainst/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
0 tests/kola/nondestructive/misc.sh → tests/kolainst/nondestructive/misc.sh
View file
Open in desktop
File renamed without changes.