diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab17f9826a..097550b423 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,10 +40,10 @@ variables: # these tags should be updated each time the list of packages is updated # changing these will force rebuilding the associated image # 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' 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' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' diff --git a/.gitlab-ci/fedora-install.sh b/.gitlab-ci/fedora-install.sh index fe2fd55669..eff9e52432 100755 --- a/.gitlab-ci/fedora-install.sh +++ b/.gitlab-ci/fedora-install.sh @@ -21,7 +21,8 @@ if [ $IS_CENTOS = 1 ]; then else dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm 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 fi fi