summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2022-07-06 18:36:52 +0200
committerThomas Haller <thaller@redhat.com>2022-07-06 18:36:52 +0200
commitb12281089ca298a75554012ee19a176cc17ed5c8 (patch)
treef31670146c7559cefd9f32a13a8d3e03b8fbbf75
parent8dff528195cca4b90e7ccdd8a31d6d9c0eb59d98 (diff)
downloadNetworkManager-b12281089ca298a75554012ee19a176cc17ed5c8.tar.gz
gitlab-ci: fix unit tests on centos7 for python-pexpect dependency
Fixes: 9570224e86c4 ('tests/client: add a pexpect-based test runner')
-rw-r--r--.gitlab-ci.yml10
-rw-r--r--.gitlab-ci/config.yml2
-rwxr-xr-xcontrib/fedora/REQUIRED_PACKAGES2
3 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86a389125e..2417f79903 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,11 +48,11 @@ variables:
#
# This is done by running `ci-fairy generate-template` and possibly bumping
# ".default_tag".
- FEDORA_TAG: '2022-06-27.0-20f11105576e'
- UBUNTU_TAG: '2022-06-27.0-1dbb38dce8f7'
- DEBIAN_TAG: '2022-06-27.0-1dbb38dce8f7'
- CENTOS_TAG: '2022-06-27.0-20f11105576e'
- ALPINE_TAG: '2022-06-27.0-182d174255fc'
+ FEDORA_TAG: '2022-07-06.0-fa9b72c30822'
+ UBUNTU_TAG: '2022-07-06.0-4b75c457c847'
+ DEBIAN_TAG: '2022-07-06.0-4b75c457c847'
+ CENTOS_TAG: '2022-07-06.0-fa9b72c30822'
+ ALPINE_TAG: '2022-07-06.0-a2327031454c'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index e5726cce9f..8c1010f7b7 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -8,7 +8,7 @@
#
# We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2022-06-27.0'
+.default_tag: &default_tag '2022-07-06.0'
# The list of all distributions we want to create job for.
diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES
index 2f80c549fe..c77f4ccdc1 100755
--- a/contrib/fedora/REQUIRED_PACKAGES
+++ b/contrib/fedora/REQUIRED_PACKAGES
@@ -95,7 +95,9 @@ install_ignore_missing \
libasan \
libpsl-devel \
libubsan \
+ pexpect \
pygobject3-base \
python-gobject-base \
+ python36-pexpect \
qt-devel \
#end