diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e88102f..3835c0be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,14 +92,15 @@ Manifests: extends: .terraform script: - schutzbot/deploy.sh - - schutzbot/manifest_tests.sh + - schutzbot/manifest_tests.sh ${PARALLEL_EXEC} artifacts: when: always paths: - manifest-db/generated-image-infos/ parallel: matrix: - - RUNNER: + - PARALLEL_EXEC: ["1/4", "2/4", "3/4", "4/4"] + RUNNER: - aws/fedora-36-x86_64 - aws/fedora-36-aarch64 - aws/fedora-37-x86_64 @@ -108,7 +109,8 @@ Manifests: - aws/centos-stream-8-aarch64 - aws/centos-stream-9-x86_64 - aws/centos-stream-9-aarch64 - - RUNNER: + - PARALLEL_EXEC: ["1/4", "2/4", "3/4", "4/4"] + RUNNER: - aws/rhel-8.7-ga-x86_64 - aws/rhel-8.7-ga-aarch64 - aws/rhel-8.8-nightly-x86_64 diff --git a/schutzbot/manifest_tests.sh b/schutzbot/manifest_tests.sh index ef2f7a14..aad8b49a 100755 --- a/schutzbot/manifest_tests.sh +++ b/schutzbot/manifest_tests.sh @@ -19,6 +19,8 @@ chcon $OSBUILD_LABEL tools/image-info # set the maximum cache size to unlimited echo "{}" | sudo osbuild --store /var/lib/osbuild/store --cache-max-size unlimited - +IFS='/' read -r -a array <<< $1 + # run the tests from the manifest-db for this arch+distro echo "Running the osbuild-image-test for arch $ARCH and ditribution $DISTRO_CODE" -sudo tools/osbuild-image-test --arch=$ARCH --distro=$DISTRO_CODE --image-info-path=tools/image-info +sudo tools/osbuild-image-test --arch=$ARCH --distro=$DISTRO_CODE --image-info-path=tools/image-info --instance-number="${array[0]}" --total-number-of-instances="${array[1]}"