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
This commit is contained in:
Carlos Goncalves 2020-06-18 22:01:27 +02:00
parent 04b3d6a165
commit 1ea2fb18c0
6 changed files with 2 additions and 31 deletions

View File

@ -38,10 +38,6 @@ function octavia_lib_install {
fi fi
} }
function install_diskimage_builder {
setup_dev_lib -bindep "diskimage-builder"
}
function set_octavia_worker_image_owner_id { function set_octavia_worker_image_owner_id {
image_id=$(openstack image list --property name=${OCTAVIA_AMP_IMAGE_NAME} -f value -c 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) 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 { 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 # Pull in DIB local elements if they are defined in devstack
if [ -n "$DIB_LOCAL_ELEMENTS" ]; then if [ -n "$DIB_LOCAL_ELEMENTS" ]; then
export DIB_LOCAL_ELEMENTS=$DIB_LOCAL_ELEMENTS export DIB_LOCAL_ELEMENTS=$DIB_LOCAL_ELEMENTS

View File

@ -16,9 +16,6 @@ function load_conf_hook {
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican"$'\n' export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican"$'\n'
# Allow testing against diskimage-builder changes with depends-on
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT+=,diskimage-builder"$'\n'
# Sort out our gate args # Sort out our gate args
. $(dirname "$0")/decode_args.sh . $(dirname "$0")/decode_args.sh

View File

@ -40,7 +40,6 @@
fi fi
export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/barbican $PROJECTS"
export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS"
export PROJECTS="openstack/diskimage-builder $PROJECTS"
export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS"
export PROJECTS="openstack/octavia-lib $PROJECTS" export PROJECTS="openstack/octavia-lib $PROJECTS"

View File

@ -39,7 +39,6 @@
fi fi
export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/barbican $PROJECTS"
export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS"
export PROJECTS="openstack/diskimage-builder $PROJECTS"
export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS"
export PROJECTS="openstack/octavia-lib $PROJECTS" export PROJECTS="openstack/octavia-lib $PROJECTS"

View File

@ -5,8 +5,6 @@
required-projects: required-projects:
- openstack/devstack-gate - openstack/devstack-gate
- openstack/barbican - openstack/barbican
- name: openstack/diskimage-builder
override-checkout: 2.30.0
- openstack/neutron-lbaas - openstack/neutron-lbaas
- openstack/octavia - openstack/octavia
- openstack/octavia-lib - openstack/octavia-lib

View File

@ -44,22 +44,13 @@
- octavia-v1-dsvm-py3x-scenario - octavia-v1-dsvm-py3x-scenario
- octavia-v2-dsvm-noop-api - octavia-v2-dsvm-noop-api
- octavia-v2-dsvm-noop-py2-api - octavia-v2-dsvm-noop-py2-api
- octavia-v2-dsvm-scenario: - octavia-v2-dsvm-scenario
required-projects:
- name: openstack/diskimage-builder
override-checkout: 2.30.0
- octavia-v2-dsvm-py2-scenario - octavia-v2-dsvm-py2-scenario
- octavia-v2-dsvm-py2-scenario-centos-7: - octavia-v2-dsvm-py2-scenario-centos-7:
voting: false voting: false
- octavia-v2-dsvm-scenario-ubuntu-bionic: - octavia-v2-dsvm-scenario-ubuntu-bionic:
required-projects:
- name: openstack/diskimage-builder
override-checkout: 2.30.0
voting: false voting: false
- octavia-v2-dsvm-scenario-two-node: - octavia-v2-dsvm-scenario-two-node:
required-projects:
- name: openstack/diskimage-builder
override-checkout: 2.30.0
voting: false voting: false
- octavia-v2-dsvm-py2-scenario-two-node: - octavia-v2-dsvm-py2-scenario-two-node:
voting: false voting: false
@ -76,9 +67,6 @@
- ^(test-|)requirements.txt$ - ^(test-|)requirements.txt$
- ^tox.ini$ - ^tox.ini$
- octavia-v2-dsvm-tls-barbican: - octavia-v2-dsvm-tls-barbican:
required-projects:
- name: openstack/diskimage-builder
override-checkout: 2.30.0
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^api-ref/.*$ - ^api-ref/.*$
@ -116,10 +104,7 @@
- neutron-lbaasv2-dsvm-py3x-api - neutron-lbaasv2-dsvm-py3x-api
- octavia-v2-dsvm-noop-api - octavia-v2-dsvm-noop-api
- octavia-v2-dsvm-noop-py2-api - octavia-v2-dsvm-noop-py2-api
- octavia-v2-dsvm-scenario: - octavia-v2-dsvm-scenario
required-projects:
- name: openstack/diskimage-builder
override-checkout: 2.30.0
- octavia-v2-dsvm-py2-scenario - octavia-v2-dsvm-py2-scenario
periodic: periodic:
jobs: jobs: