From 297de3011c954d8ba274737968e8f26224ede984 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Tue, 21 Jun 2022 14:12:21 +0200
Subject: [PATCH] Fix CI due to pycdlib dropping Python 2 support. (#4865)
---
tests/integration/targets/iso_create/meta/main.yml | 1 +
tests/integration/targets/iso_create/tasks/main.yml | 1 +
tests/utils/constraints.txt | 1 +
3 files changed, 3 insertions(+)
diff --git a/tests/integration/targets/iso_create/meta/main.yml b/tests/integration/targets/iso_create/meta/main.yml
index 56bc554611..a121ba3e47 100644
--- a/tests/integration/targets/iso_create/meta/main.yml
+++ b/tests/integration/targets/iso_create/meta/main.yml
@@ -1,3 +1,4 @@
dependencies:
- setup_pkg_mgr
- setup_remote_tmp_dir
+ - setup_remote_constraints
diff --git a/tests/integration/targets/iso_create/tasks/main.yml b/tests/integration/targets/iso_create/tasks/main.yml
index 0e21e01aef..f55b94543c 100644
--- a/tests/integration/targets/iso_create/tasks/main.yml
+++ b/tests/integration/targets/iso_create/tasks/main.yml
@@ -10,6 +10,7 @@
pip:
name: pycdlib
# state: latest
+ extra_args: "-c {{ remote_constraints }}"
register: install_pycdlib
- debug: var=install_pycdlib
diff --git a/tests/utils/constraints.txt b/tests/utils/constraints.txt
index 395e0096e4..876f4dd36c 100644
--- a/tests/utils/constraints.txt
+++ b/tests/utils/constraints.txt
@@ -49,6 +49,7 @@ cffi >= 1.14.2, != 1.14.3 # Yanked version which older versions of pip will stil
redis == 2.10.6 ; python_version < '2.7'
redis < 4.0.0 ; python_version >= '2.7' and python_version < '3.6'
redis ; python_version >= '3.6'
+pycdlib < 1.13.0 ; python_version < '3' # 1.13.0 does not work with Python 2, while not declaring that
# freeze pylint and its requirements for consistent test results
astroid == 2.2.5