Browse Source

Do not install diskimage-builder from Git

Diskimage-builder recently dropped Python 2 support (>= 3.0.0).
Installing DIB from Git pulls Python 3-only DIB which breaks Python 2
devstack environments.

This patch drops the option to install DIB from Git. DIB will now
install what is set in stable/stein upper-constraints.txt [1].

[1] 91f0aa3eca/upper-constraints.txt (L511)

Depends-On: https://review.opendev.org/#/c/733778/
Change-Id: I057f9a8353de471d605a5a5c2860d7caa9d3bd28
(cherry picked from commit 4a95b35490)
tags/4.1.2
Carlos Goncalves 1 month ago
committed by Michael Johnson
parent
commit
aefbef1245
4 changed files with 22 additions and 14 deletions
  1. +1
    -7
      devstack/plugin.sh
  2. +0
    -3
      devstack/settings
  3. +4
    -2
      zuul.d/jobs.yaml
  4. +17
    -2
      zuul.d/projects.yaml

+ 1
- 7
devstack/plugin.sh View File

@@ -39,13 +39,7 @@ function octavia_lib_install {
}

function install_diskimage_builder {
if use_library_from_git "diskimage-builder"; then
GITREPO["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_URL
GITDIR["diskimage-builder"]=$DISKIMAGE_BUILDER_DIR
GITBRANCH["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_REF
git_clone_by_name "diskimage-builder"
setup_dev_lib "diskimage-builder"
fi
setup_dev_lib -bindep "diskimage-builder"
}

function set_octavia_worker_image_owner_id {


+ 0
- 3
devstack/settings View File

@@ -2,9 +2,6 @@

OCTAVIA=${OCTAVIA:-"octavia"}
OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/octavia"}
DISKIMAGE_BUILDER_REPO_URL=${DISKIMAGE_BUILDER_REPO_URL:-${GIT_BASE}/openstack/diskimage-builder.git}
DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder
OCTAVIA_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)}
OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}
OCTAVIA_SSH_DIR=${OCTAVIA_SSH_DIR:-${OCTAVIA_CONF_DIR}/.ssh}


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

@@ -5,7 +5,8 @@
required-projects:
- openstack/devstack-gate
- openstack/barbican
- openstack/diskimage-builder
- name: openstack/diskimage-builder
override-checkout: 2.30.0
- openstack/neutron-lbaas
- openstack/octavia
- openstack/octavia-lib
@@ -40,7 +41,8 @@
run: playbooks/image-build/run.yaml
post-run: playbooks/image-build/post.yaml
required-projects:
- openstack/diskimage-builder
- name: openstack/diskimage-builder
override-checkout: 2.30.0
- openstack/octavia
- job:
name: publish-openstack-octavia-amphora-image-xenial


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

@@ -44,13 +44,22 @@
- octavia-v1-dsvm-py3x-scenario
- octavia-v2-dsvm-noop-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-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
@@ -66,6 +75,9 @@
- ^(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/.*$
@@ -103,7 +115,10 @@
- neutron-lbaasv2-dsvm-py3x-api
- octavia-v2-dsvm-noop-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-grenade:
irrelevant-files:


Loading…
Cancel
Save