particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: remove fedora 34 hack from mockbuild

Browse source 
This is apparently not needed anymore, I checked with 20 jobs here:
https://gitlab.com/osbuild/ci/osbuild-composer/-/pipelines/328779200

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-06-29 09:59:38 +02:00 • committed by Alexander Todorov
parent 0ddfc32957
commit 42e4a5f6ac
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
schutzbot/mockbuild.sh
View file

@ -83,19 +83,12 @@ if [[ $VERSION_ID == 8.4 ]]; then
echo '"""' | sudo tee -a /etc/mock/templates/rhel-8.tpl echo '"""' | sudo tee -a /etc/mock/templates/rhel-8.tpl
fi fi
# Use chroot() call instead of nspawn until a bug in F34 is fixed
# https://bugzilla.redhat.com/show_bug.cgi?id=1931452
if [[ "$NAME" == "Fedora" && "$VERSION_ID" == "34" ]]; then
MOCK_WORKAROUND="--isolation=simple"
fi
greenprint "🔧 Building source RPM" greenprint "🔧 Building source RPM"
git archive --prefix "osbuild-composer-${COMMIT}/" --output "osbuild-composer-${COMMIT}.tar.gz" HEAD git archive --prefix "osbuild-composer-${COMMIT}/" --output "osbuild-composer-${COMMIT}.tar.gz" HEAD
sudo mock -r "$MOCK_CONFIG" --buildsrpm \ sudo mock -r "$MOCK_CONFIG" --buildsrpm \
--define "commit ${COMMIT}" \ --define "commit ${COMMIT}" \
--spec ./osbuild-composer.spec \ --spec ./osbuild-composer.spec \
--sources "./osbuild-composer-${COMMIT}.tar.gz" \ --sources "./osbuild-composer-${COMMIT}.tar.gz" \
${MOCK_WORKAROUND:-} \
--resultdir ./srpm --resultdir ./srpm
greenprint "🎁 Building RPMs" greenprint "🎁 Building RPMs"
@ -103,7 +96,6 @@ sudo mock -r "$MOCK_CONFIG" \
--define "commit ${COMMIT}" \ --define "commit ${COMMIT}" \
--with=tests \ --with=tests \
--resultdir "$REPO_DIR" \ --resultdir "$REPO_DIR" \
${MOCK_WORKAROUND:-} \
srpm/*.src.rpm srpm/*.src.rpm
# Change the ownership of all of our repo files from root to our CI user. # Change the ownership of all of our repo files from root to our CI user.