test: rename image-tests to integration

We already have something called image-tests, so this naming was
confusing. This is a collection of generic integration tests, so name
them accordingly.

Signed-off-by: Tom Gundersen <teg@jklm.no>

schutzbot/Jenkinsfile

@@ -561,7 +561,7 @@ void run_tests(test_type) {
     if (test_type == 'ostree') {
         sh (
             label: "OSTree tests",
-            script: "test/image-tests/ostree.sh"
+            script: "test/integration/ostree.sh"
         )
     }
 
@@ -569,31 +569,31 @@ void run_tests(test_type) {
         // Run Koji tests.
         sh (
             label: "Koji tests",
-            script: "test/image-tests/koji.sh"
+            script: "test/integration/koji.sh"
         )
 
         // Run the qcow2 test.
         sh (
             label: "Integration test: QCOW2",
-            script: "test/image-tests/qemu.sh qcow2"
+            script: "test/integration/qemu.sh qcow2"
         )
 
         // Run the openstack test.
         sh (
             label: "Integration test: OpenStack",
-            script: "test/image-tests/qemu.sh openstack"
+            script: "test/integration/qemu.sh openstack"
         )
 
         // Run the VHD/Azure test.
         sh (
             label: "Integration test: VHD",
-            script: "test/image-tests/qemu.sh vhd"
+            script: "test/integration/qemu.sh vhd"
         )
 
         // Run the AWS test.
         sh (
             label: "Integration test: AWS",
-            script: "test/image-tests/aws.sh"
+            script: "test/integration/aws.sh"
         )
     }
 

schutzbot/deploy.sh

@@ -78,7 +78,7 @@ fi
 greenprint "Copying custom composer config"
 # Remote worker needs this
 sudo mkdir -p /etc/osbuild-composer
-sudo cp test/image-tests/osbuild-composer.toml \
+sudo cp test/integration/osbuild-composer.toml \
     /etc/osbuild-composer/
 
 greenprint "Copying pre-generated SSL certificates"

test/integration/koji.sh

@@ -37,7 +37,7 @@ sudo ./internal/upload/koji/run-koji-container.sh start
 
 greenprint "Copying custom worker config"
 sudo mkdir -p /etc/osbuild-worker
-sudo cp test/image-tests/osbuild-worker.toml \
+sudo cp test/integration/osbuild-worker.toml \
     /etc/osbuild-worker/
 
 greenprint "Adding kerberos config"
@@ -48,7 +48,7 @@ sudo cp \
     /tmp/osbuild-composer-koji-test/client.keytab \
     /etc/osbuild-worker/client.keytab
 sudo cp \
-    test/image-tests/krb5-local.conf \
+    test/integration/krb5-local.conf \
     /etc/krb5.conf.d/local
 
 greenprint "Adding generated CA cert for Koji"
@@ -68,7 +68,7 @@ greenprint "Creating Koji task"
 koji --server=http://localhost:8080/kojihub --user kojiadmin --password kojipass --authtype=password make-task image
 
 greenprint "Pushing compose to Koji"
-sudo ./test/image-tests/koji-compose.py "${ID}-${VERSION_ID%.*}"
+sudo ./test/integration/koji-compose.py "${ID}-${VERSION_ID%.*}"
 
 greenprint "Show Koji task"
 koji --server=http://localhost:8080/kojihub taskinfo 1