Merge pull request #2116 from cgwalters/kolainst

tests/kola: Move to tests/kolainst
2024-12-22 17:35:55 +03:00 · 2020-05-27 11:43:22 -04:00 · 2020-05-27 11:43:22 -04:00 · 854099802f
commit 854099802f
parent 936301608a 718cca8055
22 changed files with 3 additions and 4 deletions
--- 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}")
--- a/tests/kolainst/Makefile
+++ b/tests/kolainst/Makefile
--- a/tests/kolainst/README.md
+++ b/tests/kolainst/README.md
--- a/tests/kolainst/destructive/data
+++ b/tests/kolainst/destructive/data
--- a/tests/kolainst/destructive/itest-bare-root.sh
+++ b/tests/kolainst/destructive/itest-bare-root.sh
--- a/tests/kolainst/destructive/itest-deploy-selinux.sh
+++ b/tests/kolainst/destructive/itest-deploy-selinux.sh
--- a/tests/kolainst/destructive/itest-label-selinux.sh
+++ b/tests/kolainst/destructive/itest-label-selinux.sh
--- a/tests/kolainst/destructive/staged-delay.sh
+++ b/tests/kolainst/destructive/staged-delay.sh
--- a/tests/kolainst/destructive/staged-deploy.sh
+++ b/tests/kolainst/destructive/staged-deploy.sh
--- a/tests/kolainst/destructive/var-mount.sh
+++ b/tests/kolainst/destructive/var-mount.sh
--- a/tests/kolainst/libinsttest.sh
+++ b/tests/kolainst/libinsttest.sh
--- a/tests/kolainst/libtest-core.sh
+++ b/tests/kolainst/libtest-core.sh
--- a/tests/kolainst/nondestructive/data
+++ b/tests/kolainst/nondestructive/data
--- a/tests/kolainst/nondestructive/itest-bare-unit.sh
+++ b/tests/kolainst/nondestructive/itest-bare-unit.sh
--- a/tests/kolainst/nondestructive/itest-bare-user-root.sh
+++ b/tests/kolainst/nondestructive/itest-bare-user-root.sh
--- a/tests/kolainst/nondestructive/itest-bareuser-nouserxattrs.sh
+++ b/tests/kolainst/nondestructive/itest-bareuser-nouserxattrs.sh
--- a/tests/kolainst/nondestructive/itest-payload-link.sh
+++ b/tests/kolainst/nondestructive/itest-payload-link.sh
--- a/tests/kolainst/nondestructive/itest-pull-space.sh
+++ b/tests/kolainst/nondestructive/itest-pull-space.sh
--- a/tests/kolainst/nondestructive/itest-pull.sh
+++ b/tests/kolainst/nondestructive/itest-pull.sh
--- a/tests/kolainst/nondestructive/itest-remotes.sh
+++ b/tests/kolainst/nondestructive/itest-remotes.sh
--- a/tests/kolainst/nondestructive/libtest-core.sh
+++ b/tests/kolainst/nondestructive/libtest-core.sh
--- a/tests/libtest-core.sh
+++ b/tests/libtest-core.sh
@ -1 +1 @@
-kola/libtest-core.sh
+kolainst/libtest-core.sh