gitlab-ci: fix failure to enable PowerTools on CentOS8 build

Seems that the repository was renamed (or can sometimes have
a different name). Try both the "PowerTools" and "powertools" name.
This commit is contained in:
Thomas Haller
2020-12-11 18:02:45 +01:00
parent 77a6fde1e2
commit 4ce62b6df3
2 changed files with 4 additions and 3 deletions

View File

@@ -40,10 +40,10 @@ variables:
# these tags should be updated each time the list of packages is updated # these tags should be updated each time the list of packages is updated
# changing these will force rebuilding the associated image # changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular NM version # Note: these tags have no meaning and are not tied to a particular NM version
FEDORA_TAG: '2020-11-17.0-0a04bc0f5618' FEDORA_TAG: '2020-11-17.0-6646b220c743'
UBUNTU_TAG: '2020-11-17.0-89dd88de8047' UBUNTU_TAG: '2020-11-17.0-89dd88de8047'
DEBIAN_TAG: '2020-11-17.0-89dd88de8047' DEBIAN_TAG: '2020-11-17.0-89dd88de8047'
CENTOS_TAG: '2020-11-17.0-0a04bc0f5618' CENTOS_TAG: '2020-11-17.0-6646b220c743'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'

View File

@@ -21,6 +21,7 @@ if [ $IS_CENTOS = 1 ]; then
else else
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
dnf install -y 'dnf-command(config-manager)' dnf install -y 'dnf-command(config-manager)'
dnf config-manager --set-enabled powertools || \
dnf config-manager --set-enabled PowerTools dnf config-manager --set-enabled PowerTools
curl https://copr.fedorainfracloud.org/coprs/nmstate/nm-build-deps/repo/epel-8/nmstate-nm-build-deps-epel-8.repo > /etc/yum.repos.d/nmstate-nm-build-deps-epel-8.repo curl https://copr.fedorainfracloud.org/coprs/nmstate/nm-build-deps/repo/epel-8/nmstate-nm-build-deps-epel-8.repo > /etc/yum.repos.d/nmstate-nm-build-deps-epel-8.repo
fi fi