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 commit4a95b35490
)
This commit is contained in:
parent
5dd672c58c
commit
aefbef1245
|
@ -39,13 +39,7 @@ function octavia_lib_install {
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_diskimage_builder {
|
function install_diskimage_builder {
|
||||||
if use_library_from_git "diskimage-builder"; then
|
setup_dev_lib -bindep "diskimage-builder"
|
||||||
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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function set_octavia_worker_image_owner_id {
|
function set_octavia_worker_image_owner_id {
|
||||||
|
|
|
@ -2,9 +2,6 @@
|
||||||
|
|
||||||
OCTAVIA=${OCTAVIA:-"octavia"}
|
OCTAVIA=${OCTAVIA:-"octavia"}
|
||||||
OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/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_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)}
|
||||||
OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}
|
OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}
|
||||||
OCTAVIA_SSH_DIR=${OCTAVIA_SSH_DIR:-${OCTAVIA_CONF_DIR}/.ssh}
|
OCTAVIA_SSH_DIR=${OCTAVIA_SSH_DIR:-${OCTAVIA_CONF_DIR}/.ssh}
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/devstack-gate
|
- openstack/devstack-gate
|
||||||
- openstack/barbican
|
- openstack/barbican
|
||||||
- openstack/diskimage-builder
|
- 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
|
||||||
|
@ -40,7 +41,8 @@
|
||||||
run: playbooks/image-build/run.yaml
|
run: playbooks/image-build/run.yaml
|
||||||
post-run: playbooks/image-build/post.yaml
|
post-run: playbooks/image-build/post.yaml
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/diskimage-builder
|
- name: openstack/diskimage-builder
|
||||||
|
override-checkout: 2.30.0
|
||||||
- openstack/octavia
|
- openstack/octavia
|
||||||
- job:
|
- job:
|
||||||
name: publish-openstack-octavia-amphora-image-xenial
|
name: publish-openstack-octavia-amphora-image-xenial
|
||||||
|
|
|
@ -44,13 +44,22 @@
|
||||||
- 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
|
||||||
|
@ -66,6 +75,9 @@
|
||||||
- ^(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/.*$
|
||||||
|
@ -103,7 +115,10 @@
|
||||||
- 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
|
||||||
- octavia-grenade:
|
- octavia-grenade:
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
|
|
Loading…
Reference in New Issue