Browse Source

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
changes/24/736824/2
Carlos Goncalves 3 weeks ago
parent
commit
1ea2fb18c0
6 changed files with 2 additions and 31 deletions
  1. +0
    -7
      devstack/plugin.sh
  2. +0
    -3
      octavia/tests/contrib/gate_hook.sh
  3. +0
    -1
      playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run.yaml
  4. +0
    -1
      playbooks/legacy/octavia-v1-dsvm-scenario/run.yaml
  5. +0
    -2
      zuul.d/jobs.yaml
  6. +2
    -17
      zuul.d/projects.yaml

+ 0
- 7
devstack/plugin.sh View File

@@ -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


+ 0
- 3
octavia/tests/contrib/gate_hook.sh 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'

# 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
. $(dirname "$0")/decode_args.sh



+ 0
- 1
playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run.yaml View File

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


+ 0
- 1
playbooks/legacy/octavia-v1-dsvm-scenario/run.yaml View File

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


+ 0
- 2
zuul.d/jobs.yaml View File

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


+ 2
- 17
zuul.d/projects.yaml View File

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


Loading…
Cancel
Save