ostreedev · openshift-merge-robot · May 27, 2020 · May 27, 2020
diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
@@ -76,9 +76,8 @@ 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
+        # Install the tests
+        make -C tests/kolainst install
       """)
     }
     fcosKola(cosaDir: "${env.WORKSPACE}")

diff --git a/tests/kola/Makefile → tests/kolainst/Makefile b/tests/kola/Makefile → tests/kolainst/Makefile
diff --git a/tests/kola/README.md → tests/kolainst/README.md b/tests/kola/README.md → tests/kolainst/README.md
diff --git a/tests/kola/destructive/data → tests/kolainst/destructive/data b/tests/kola/destructive/data → tests/kolainst/destructive/data
diff --git a/tests/kola/destructive/itest-bare-root.sh → ...s/kolainst/destructive/itest-bare-root.sh b/tests/kola/destructive/itest-bare-root.sh → ...s/kolainst/destructive/itest-bare-root.sh
diff --git a/.../kola/destructive/itest-deploy-selinux.sh → ...ainst/destructive/itest-deploy-selinux.sh b/.../kola/destructive/itest-deploy-selinux.sh → ...ainst/destructive/itest-deploy-selinux.sh
diff --git a/...s/kola/destructive/itest-label-selinux.sh → ...lainst/destructive/itest-label-selinux.sh b/...s/kola/destructive/itest-label-selinux.sh → ...lainst/destructive/itest-label-selinux.sh
diff --git a/tests/kola/destructive/staged-delay.sh → tests/kolainst/destructive/staged-delay.sh b/tests/kola/destructive/staged-delay.sh → tests/kolainst/destructive/staged-delay.sh
diff --git a/tests/kola/destructive/staged-deploy.sh → tests/kolainst/destructive/staged-deploy.sh b/tests/kola/destructive/staged-deploy.sh → tests/kolainst/destructive/staged-deploy.sh
diff --git a/tests/kola/destructive/var-mount.sh → tests/kolainst/destructive/var-mount.sh b/tests/kola/destructive/var-mount.sh → tests/kolainst/destructive/var-mount.sh
diff --git a/tests/kola/libinsttest.sh → tests/kolainst/libinsttest.sh b/tests/kola/libinsttest.sh → tests/kolainst/libinsttest.sh
diff --git a/tests/kola/libtest-core.sh → tests/kolainst/libtest-core.sh b/tests/kola/libtest-core.sh → tests/kolainst/libtest-core.sh
diff --git a/tests/kola/nondestructive/data → tests/kolainst/nondestructive/data b/tests/kola/nondestructive/data → tests/kolainst/nondestructive/data
diff --git a/tests/kola/nondestructive/itest-bare-unit.sh → ...olainst/nondestructive/itest-bare-unit.sh b/tests/kola/nondestructive/itest-bare-unit.sh → ...olainst/nondestructive/itest-bare-unit.sh
diff --git a/...la/nondestructive/itest-bare-user-root.sh → ...st/nondestructive/itest-bare-user-root.sh b/...la/nondestructive/itest-bare-user-root.sh → ...st/nondestructive/itest-bare-user-root.sh
diff --git a/...estructive/itest-bareuser-nouserxattrs.sh → ...estructive/itest-bareuser-nouserxattrs.sh b/...estructive/itest-bareuser-nouserxattrs.sh → ...estructive/itest-bareuser-nouserxattrs.sh
diff --git a/...kola/nondestructive/itest-payload-link.sh → ...inst/nondestructive/itest-payload-link.sh b/...kola/nondestructive/itest-payload-link.sh → ...inst/nondestructive/itest-payload-link.sh
diff --git a/...s/kola/nondestructive/itest-pull-space.sh → ...lainst/nondestructive/itest-pull-space.sh b/...s/kola/nondestructive/itest-pull-space.sh → ...lainst/nondestructive/itest-pull-space.sh
diff --git a/tests/kola/nondestructive/itest-pull.sh → tests/kolainst/nondestructive/itest-pull.sh b/tests/kola/nondestructive/itest-pull.sh → tests/kolainst/nondestructive/itest-pull.sh
diff --git a/tests/kola/nondestructive/itest-remotes.sh → .../kolainst/nondestructive/itest-remotes.sh b/tests/kola/nondestructive/itest-remotes.sh → .../kolainst/nondestructive/itest-remotes.sh
diff --git a/tests/kola/nondestructive/libtest-core.sh → ...s/kolainst/nondestructive/libtest-core.sh b/tests/kola/nondestructive/libtest-core.sh → ...s/kolainst/nondestructive/libtest-core.sh
diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh
@@ -1 +1 @@
-kola/libtest-core.sh
+kolainst/libtest-core.sh