From 75ae584e6d323394824b9c1086cdf6c9dadccb59 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 23 May 2020 14:34:57 +0000
Subject: [PATCH] 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.
---
 .cci.jenkinsfile                                |  2 ++
 tests/kola/nondestructive/data                  |  1 -
 tests/kolainst/Makefile                         | 13 +++++++++++++
 tests/{kola => kolainst}/nondestructive/misc.sh |  0
 4 files changed, 15 insertions(+), 1 deletion(-)
 delete mode 120000 tests/kola/nondestructive/data
 create mode 100644 tests/kolainst/Makefile
 rename tests/{kola => kolainst}/nondestructive/misc.sh (100%)

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index f9750ffe..9bb50be1 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -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") {
diff --git a/tests/kola/nondestructive/data b/tests/kola/nondestructive/data
deleted file mode 120000
index dc879abe..00000000
--- a/tests/kola/nondestructive/data
+++ /dev/null
@@ -1 +0,0 @@
-../../common
\ No newline at end of file
diff --git a/tests/kolainst/Makefile b/tests/kolainst/Makefile
new file mode 100644
index 00000000..267f7193
--- /dev/null
+++ b/tests/kolainst/Makefile
@@ -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
diff --git a/tests/kola/nondestructive/misc.sh b/tests/kolainst/nondestructive/misc.sh
similarity index 100%
rename from tests/kola/nondestructive/misc.sh
rename to tests/kolainst/nondestructive/misc.sh