ci: Make the fedora image toolbox compatible

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1060>
This commit is contained in:
Philippe Normand 2023-09-01 21:38:14 +03:00 committed by Jordan Petridis
parent 98eab9a562
commit 3779eb5c83
3 changed files with 3 additions and 2 deletions

View file

@ -116,6 +116,7 @@ trigger:
.fedora image: .fedora image:
variables: variables:
FDO_BASE_IMAGE: 'registry.fedoraproject.org/fedora-toolbox:34'
FDO_DISTRIBUTION_VERSION: '34' FDO_DISTRIBUTION_VERSION: '34'
FDO_REPO_SUFFIX: "$FEDORA_AMD64_SUFFIX" FDO_REPO_SUFFIX: "$FEDORA_AMD64_SUFFIX"
FDO_DISTRIBUTION_TAG: "$FEDORA_TAG-$GST_UPSTREAM_BRANCH" FDO_DISTRIBUTION_TAG: "$FEDORA_TAG-$GST_UPSTREAM_BRANCH"

View file

@ -5,7 +5,7 @@ variables:
# If you are hacking on them or need a them to rebuild, its enough # If you are hacking on them or need a them to rebuild, its enough
# to change any part of the string of the image you want. # to change any part of the string of the image you want.
### ###
FEDORA_TAG: '2023-08-31.1-f34' FEDORA_TAG: '2023-09-28.0-f34tlbx'
INDENT_TAG: '2023-08-24.3' INDENT_TAG: '2023-08-24.3'

View file

@ -7,7 +7,7 @@ set -eux
sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf
dnf -y swap coreutils-single coreutils-full dnf -y swap coreutils-single coreutils-full
dnf install -y git-core dnf-plugins-core python3-pip dnf install -y git-core dnf-plugins-core python3-pip toolbox-experience
# Configure git for various usage # Configure git for various usage
git config --global user.email "gstreamer@gstreamer.net" git config --global user.email "gstreamer@gstreamer.net"