ci: Excute image_tests directly from osbuild-composer-tests

instead of duplicating the same script here!

Specifies needed cloud credentials.

NOTE: don't start osbuild-composer in deploy.sh because this is
now done by /usr/libexec/osbuild-composer-test/provision.sh. Otherwise
leads to errors because the socket is already taken.

schutzbot/Jenkinsfile

@@ -128,6 +128,10 @@ pipeline {
                         TEST_TYPE = "image"
                         AWS_CREDS = credentials('aws-credentials-osbuildci')
                         DISTRO_CODE = "fedora32"
+                        AWS_IMAGE_TEST_CREDS = credentials('aws-credentials-osbuild-image-test')
+                        AZURE_CREDS = credentials('azure')
+                        OPENSTACK_CREDS = credentials('psi-openstack-creds')
+                        VCENTER_CREDS = credentials('vmware-vcenter-credentials')
                     }
                     steps {
                         run_tests()
@@ -144,6 +148,10 @@ pipeline {
                         TEST_TYPE = "image"
                         AWS_CREDS = credentials('aws-credentials-osbuildci')
                         DISTRO_CODE = "fedora33"
+                        AWS_IMAGE_TEST_CREDS = credentials('aws-credentials-osbuild-image-test')
+                        AZURE_CREDS = credentials('azure')
+                        OPENSTACK_CREDS = credentials('psi-openstack-creds')
+                        VCENTER_CREDS = credentials('vmware-vcenter-credentials')
                     }
                     steps {
                         run_tests()
@@ -161,6 +169,10 @@ pipeline {
                         RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production')
                         AWS_CREDS = credentials('aws-credentials-osbuildci')
                         DISTRO_CODE = "rhel8"
+                        AWS_IMAGE_TEST_CREDS = credentials('aws-credentials-osbuild-image-test')
+                        AZURE_CREDS = credentials('azure')
+                        OPENSTACK_CREDS = credentials('psi-openstack-creds')
+                        VCENTER_CREDS = credentials('vmware-vcenter-credentials')
                     }
                     steps {
                         run_tests()
@@ -217,7 +229,7 @@ void run_tests() {
     // Run the image tests.
     sh (
         label: "Image tests",
-        script: "schutzbot/run_image_tests.sh"
+        script: "/usr/libexec/tests/osbuild-composer/image_tests.sh"
     )
 
 }

schutzbot/deploy.sh

@@ -50,10 +50,3 @@ sudo dnf -y install osbuild-composer-tests
 
 # Set up a directory to hold repository overrides.
 sudo mkdir -p /etc/osbuild-composer/repositories
-
-# Start services.
-sudo systemctl enable --now osbuild-composer.socket
-
-# Verify that the API is running.
-sudo composer-cli status show
-sudo composer-cli sources list

schutzbot/run_image_tests.sh

@@ -1,101 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Get OS and architecture details.
-source /etc/os-release
-ARCH=$(uname -m)
-
-WORKING_DIRECTORY=/usr/libexec/osbuild-composer
-IMAGE_TEST_CASE_RUNNER=/usr/libexec/tests/osbuild-composer/osbuild-image-tests
-IMAGE_TEST_CASES_PATH=/usr/share/tests/osbuild-composer/cases
-
-PASSED_TESTS=()
-FAILED_TESTS=()
-
-# Print out a nice test divider so we know when tests stop and start.
-test_divider () {
-    printf "%0.s-" {1..78} && echo
-}
-
-# Get a list of test cases.
-get_test_cases () {
-    TEST_CASE_SELECTOR="${ID}_${VERSION_ID%.*}-${ARCH}*.json"
-    pushd $IMAGE_TEST_CASES_PATH > /dev/null
-        ls "$TEST_CASE_SELECTOR"
-    popd > /dev/null
-}
-
-# Run a test case and store the result as passed or failed.
-run_test_case () {
-    TEST_RUNNER=$1
-    TEST_CASE_FILENAME=$2
-    TEST_NAME=$(basename "$TEST_CASE_FILENAME")
-
-    echo
-    test_divider
-    echo "🏃🏻 Running test: ${TEST_NAME}"
-    test_divider
-
-    # Set up the testing command with Azure secrets in the environment.
-    #
-    # This works by having a text file stored in Jenkins credentials.
-    # In Jenkinsfile, the following line assigns the path to this secret file
-    # to an environment variable called AZURE_CREDS:
-    # AZURE_CREDS = credentials('azure')
-    #
-    # The file is in the following format:
-    # KEY1=VALUE1
-    # KEY2=VALUE2
-    #
-    # Using `env $(cat $AZURE_CREDS)` we can take all the key-value pairs and
-    # save them as environment variables.
-    # Read test/README.md to see all required environment variables for Azure
-    # uploads
-    #
-    # AZURE_CREDS might not be defined in all cases (e.g. Azure doesn't
-    # support aarch64), therefore the following line sets AZURE_CREDS to
-    # /dev/null if the variable is undefined.
-    AZURE_CREDS=${AZURE_CREDS-/dev/null}
-    OPENSTACK_CREDS=${OPENSTACK_CREDS-/dev/null}
-    VCENTER_CREDS=${VCENTER_CREDS-/dev/null}
-    TEST_CMD="env $(cat "$AZURE_CREDS" "$OPENSTACK_CREDS" "$VCENTER_CREDS") BRANCH_NAME=${BRANCH_NAME-main} BUILD_ID=$BUILD_ID DISTRO_CODE=$DISTRO_CODE $TEST_RUNNER -test.v ${IMAGE_TEST_CASES_PATH}/${TEST_CASE_FILENAME}"
-
-    # Run the test and add the test name to the list of passed or failed
-    # tests depending on the result.
-    if sudo "$TEST_CMD" 2>&1 | tee "${WORKSPACE}"/"${TEST_NAME}".log; then
-        PASSED_TESTS+=("$TEST_NAME")
-    else
-        FAILED_TESTS+=("$TEST_NAME")
-    fi
-
-    test_divider
-    echo
-}
-
-# Ensure osbuild-composer-tests is installed.
-if ! rpm -qi osbuild-composer-tests > /dev/null 2>&1; then
-    sudo dnf -y install osbuild-composer-tests
-fi
-
-# Change to the working directory.
-cd $WORKING_DIRECTORY
-
-# Run each test case.
-for TEST_CASE in $(get_test_cases); do
-    run_test_case $IMAGE_TEST_CASE_RUNNER "$TEST_CASE"
-done
-
-# Print a report of the test results.
-test_divider
-echo "😃 Passed tests: " "${PASSED_TESTS[@]}"
-echo "☹ Failed tests: " "${FAILED_TESTS[@]}"
-test_divider
-
-# Exit with a failure if any tests failed.
-if [ ${#FAILED_TESTS[@]} -eq 0 ]; then
-    echo "🎉 All tests passed."
-    exit 0
-else
-    echo "🔥 One or more tests failed."
-    exit 1
-fi