diff --git a/ci/hermetic/update_rpms_lockfile b/ci/hermetic/update_rpms_lockfile index b2aa98821d..d26f59d56b 100755 --- a/ci/hermetic/update_rpms_lockfile +++ b/ci/hermetic/update_rpms_lockfile @@ -1,11 +1,14 @@ #!/bin/bash set -euo pipefail +SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)" +REPO_ROOT="$(realpath "${SCRIPT_DIR}/../..")" + # We update the 'packages' list in the rpms.in.yaml based on the content # of the *deps*.txt file located in src/. -dep_files=$(find ../../src/ -name "*deps*.txt" | tr '\n' ' ') +dep_files=$(find "${REPO_ROOT}/src/" -name "*deps*.txt" | tr '\n' ' ') # shellcheck disable=SC2086 -./update_package_list --package_file $dep_files --yaml_file rpms.in.yaml +${SCRIPT_DIR}/update_package_list --package_file $dep_files --yaml_file ${REPO_ROOT}/rpms.in.yaml # Then we update the rpms.lock.yaml file based on rpms.in.yaml with # rpm-lockfile-prototype. @@ -45,7 +48,7 @@ else exit 1 fi -rpm-lockfile-prototype rpms.in.yaml --outfile rpms.lock.yaml +rpm-lockfile-prototype ${REPO_ROOT}/rpms.in.yaml --outfile ${REPO_ROOT}/rpms.lock.yaml echo "Deactivating virtual environment..." deactivate diff --git a/ci/hermetic/rpms.in.yaml b/rpms.in.yaml similarity index 99% rename from ci/hermetic/rpms.in.yaml rename to rpms.in.yaml index 93ad9ba0c5..3cef7898ce 100644 --- a/ci/hermetic/rpms.in.yaml +++ b/rpms.in.yaml @@ -19,7 +19,7 @@ contentOrigin: varsFromContainerfile: "Dockerfile" context: - bare: false + containerfile: ./Dockerfile # TODO: for now we only enable x86_64 to speed up development and we'll add the remaining arches once the # whole pipeline (i.e build, testing and release) ready. diff --git a/ci/hermetic/rpms.lock.yaml b/rpms.lock.yaml similarity index 100% rename from ci/hermetic/rpms.lock.yaml rename to rpms.lock.yaml