diff --git a/tools/osbuilder/tests/test_images.sh b/tools/osbuilder/tests/test_images.sh index 945ae8783c..800496db92 100755 --- a/tools/osbuilder/tests/test_images.sh +++ b/tools/osbuilder/tests/test_images.sh @@ -27,7 +27,6 @@ readonly rootfs_builder=${project_dir}/rootfs-builder/rootfs.sh readonly DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc} readonly RUNTIME=${RUNTIME:-kata-runtime} readonly MACHINE_TYPE=`uname -m` -readonly CI=${CI:-} readonly KATA_HYPERVISOR="${KATA_HYPERVISOR:-}" readonly KATA_DEV_MODE="${KATA_DEV_MODE:-}" readonly ci_results_dir="/var/osbuilder/tests" @@ -280,11 +279,6 @@ setup() { mkdir -p "${images_dir}" - if [ -n "$CI" ]; then - sudo -E rm -rf ${ci_results_dir} - sudo -E mkdir -p ${ci_results_dir} - fi - [ -n "${KVM_MISSING:-}" ] && return [ ! -d "${tests_repo_dir}" ] && git clone "https://${tests_repo}" "${tests_repo_dir}" @@ -439,9 +433,7 @@ call_make() { [ "${#makeTargets[@]}" = "0" ] && makeTargets+=($targetType) makeJobs= - if [ -z "$CI" ]; then - ((makeJobs=$(nproc) / 2)) - fi + ((makeJobs=$(nproc) / 2)) # When calling make, do not use the silent_run wrapper, pass the # OSBUILDER_USE_CHRONIC instead. @@ -585,7 +577,6 @@ test_distros() # Skip failed distros if [ -e "${tmp_rootfs}/${d}_fail" ]; then info "Building rootfs for ${d} failed, not creating an image" - [ -n "$CI" ] && sudo -E touch "${ci_results_dir}/${d}_fail" continue fi @@ -607,7 +598,6 @@ test_distros() # Skip failed distros if [ -e "${tmp_rootfs}/${d}_fail" ]; then info "Building rootfs for ${d} failed, not creating an initrd" - [ -n "$CI" ] && touch "${ci_results_dir}/${d}_fail" continue fi