From d6a7eebb266616f4723d3ffcf18a78ed317d6359 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Thu, 18 Jun 2020 22:01:27 +0200
Subject: [PATCH] Remove install DIB from Git option

DIB no longer supports Python 2 and is upper constrainted to 2.30.0.
Allowing to install DIB from Git would cause nothing but trouble. Just
rely on pip to a functional DIB version.

Change-Id: I0213424eaafe079e7f9a9aaee8e29514c7e840f4
(cherry picked from commit 1ea2fb18c076049515354ca37d650a5862302a9f)
---
 devstack/plugin.sh | 7 -------
 zuul.d/jobs.yaml   | 1 -
 2 files changed, 8 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 461a7e4fbb..6be46977c5 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -38,10 +38,6 @@ function octavia_lib_install {
     fi
 }
 
-function install_diskimage_builder {
-    setup_dev_lib -bindep "diskimage-builder"
-}
-
 function set_octavia_worker_image_owner_id {
     image_id=$(openstack image list --property name=${OCTAVIA_AMP_IMAGE_NAME} -f value -c ID)
     owner_id=$(openstack image show ${image_id} -c owner -f value)
@@ -49,9 +45,6 @@ function set_octavia_worker_image_owner_id {
 }
 
 function build_octavia_worker_image {
-    # set up diskimage-builder if we need to
-    install_diskimage_builder
-
     # Pull in DIB local elements if they are defined in devstack
     if [ -n "$DIB_LOCAL_ELEMENTS" ]; then
         export DIB_LOCAL_ELEMENTS=$DIB_LOCAL_ELEMENTS
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index cd1483e7ee..cffa861cfc 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -5,7 +5,6 @@
     required-projects:
       - openstack/devstack-gate
       - openstack/barbican
-      - openstack/diskimage-builder
       - openstack/octavia
       - openstack/octavia-lib
       - openstack/python-barbicanclient