diff options
| author | Fernando Fernandez Mancera <ffmancera@riseup.net> | 2023-01-23 22:09:14 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-01-24 07:59:04 +0100 |
| commit | 5df3db672f4b84e9094f29475921a05b6a5aae12 (patch) | |
| tree | 5367e9877356045251f0d441737be1b29f8b3ee9 | |
| parent | 128c000f0c1237c48a731e5b28cb23b54f114907 (diff) | |
| download | NetworkManager-th/tmp3.tar.gz | |
gitlab-ci: fix CentOS Linux 9 containers during ".gitlab-ci/fedora-install.sh"th/tmp3
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/fedora-install.sh | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc80aae51a..f3bd3561e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,10 +53,10 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". - FEDORA_TAG: '2023-01-18.0-1423f8164e71' + FEDORA_TAG: '2023-01-18.0-296fbfd97862' UBUNTU_TAG: '2023-01-18.0-08fb4e6eb861' DEBIAN_TAG: '2023-01-18.0-08fb4e6eb861' - CENTOS_TAG: '2023-01-18.0-1423f8164e71' + CENTOS_TAG: '2023-01-18.0-296fbfd97862' ALPINE_TAG: '2023-01-18.0-14c807942fa4' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' diff --git a/.gitlab-ci/fedora-install.sh b/.gitlab-ci/fedora-install.sh index 6a4b91bfe6..575c65b743 100755 --- a/.gitlab-ci/fedora-install.sh +++ b/.gitlab-ci/fedora-install.sh @@ -23,19 +23,21 @@ fi localedef -c -i pl_PL -f UTF-8 pl_PL.UTF-8 locale -a yum install -y python36-dbus python36-gobject-base - else - if [ $IS_CENTOS_8 = 1 ]; then - # CentOS Linux 8 is now EOF and plain `dnf upgrade` does not work. We need - # to patch the mirror list. - sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* - fi + elif [ $IS_CENTOS_8 = 1 ]; then + # CentOS Linux 8 is now EOF and plain `dnf upgrade` does not work. We need + # to patch the mirror list. + sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* + sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* 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 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 + else + dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + dnf install -y 'dnf-command(config-manager)' + curl https://copr.fedorainfracloud.org/coprs/nmstate/nm-build-deps/repo/epel-9/nmstate-nm-build-deps-epel-9.repo > /etc/yum.repos.d/nmstate-nm-build-deps-epel-9.repo fi fi |