From 1d7df26775016a77dba5c5977b877faf2bcc8aac Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 19 Oct 2020 19:33:15 +0000 Subject: [PATCH] schutzbot: move test scripts into the test package `run_{base,image}_tests.sh` are osbuild-composer-specific, and should live in the `-test` subpackage, rather than as part of the testing infratructure. This is not a functional change. --- schutzbot/Jenkinsfile | 4 ++-- schutzbot/run_base_tests.sh => test/cmd/base_tests.sh | 0 schutzbot/run_image_tests.sh => test/cmd/image_tests.sh | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename schutzbot/run_base_tests.sh => test/cmd/base_tests.sh (100%) rename schutzbot/run_image_tests.sh => test/cmd/image_tests.sh (100%) diff --git a/schutzbot/Jenkinsfile b/schutzbot/Jenkinsfile index 568bb5ca0..fd1131f1a 100644 --- a/schutzbot/Jenkinsfile +++ b/schutzbot/Jenkinsfile @@ -436,14 +436,14 @@ void run_tests(test_type) { if (test_type == 'base') { sh ( label: "Base tests", - script: "schutzbot/run_base_tests.sh" + script: "/usr/libexec/tests/osbuild-composer/base_tests.sh" ) } if (test_type == 'image') { sh ( label: "Image tests", - script: "schutzbot/run_image_tests.sh" + script: "/usr/libexec/tests/osbuild-composer/image_tests.sh" ) } diff --git a/schutzbot/run_base_tests.sh b/test/cmd/base_tests.sh similarity index 100% rename from schutzbot/run_base_tests.sh rename to test/cmd/base_tests.sh diff --git a/schutzbot/run_image_tests.sh b/test/cmd/image_tests.sh similarity index 100% rename from schutzbot/run_image_tests.sh rename to test/cmd/image_tests.sh