From 583fd68ff36c730c651a02a76ac12b7ba9c20b5a Mon Sep 17 00:00:00 2001 From: Pooja Jadhav Date: Wed, 3 Jun 2020 16:32:58 +0530 Subject: [PATCH] Checkout diskimage-builder to 2.38.0 tag for CentOS-7 As python2 support removed from diskimage-builder, many of the CentOS-7 jobs affacts the python version issue. This patch fixes the issue by checking dib to 2.38.0 Closes-Bug: #1881732 Change-Id: I55ac7af4887e54877518a25545116a5c3475ebd9 --- roles/oooci-build-images/defaults/main.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/oooci-build-images/defaults/main.yaml b/roles/oooci-build-images/defaults/main.yaml index 3fcfc85dd..a809a7d44 100644 --- a/roles/oooci-build-images/defaults/main.yaml +++ b/roles/oooci-build-images/defaults/main.yaml @@ -1,6 +1,7 @@ tripleo_image_source: https://images.rdoproject.org/CentOS-8-x86_64-GenericCloud.qcow2 workspace: "{{ ansible_user_dir }}/workspace" openstack_git_root: "{{ ansible_user_dir }}/src/opendev.org/openstack" +dib_pin: "{% if ansible_distribution_major_version is version(8, '<') %}@2.38.0{% endif %}" python_version: py2: python py3: python3 @@ -8,7 +9,7 @@ base_image_config: py2: overcloud-images.yaml py3: overcloud-images-python3.yaml tripleo_pip_projects: - - "file://{{ openstack_git_root }}/diskimage-builder" + - "git+file://{{ openstack_git_root }}/diskimage-builder{{ dib_pin }}" - "file://{{ openstack_git_root }}/python-tripleoclient" - "file://{{ openstack_git_root }}/tripleo-common" tripleo_common_path: "{{ openstack_git_root }}/tripleo-common"