x
/
packstack
Code Issues Proposed changes

Install python3-wheel to unblock CI jobs 

This is partial cherry-pick from master commit to install
python3-wheel to unblock CI jobs which are failing with error:

"ERROR: 'pip wheel' requires the 'wheel' package. To fix this, run: pip install wheel"

Also switch to victoria and victoria current-passed-ci promotion
repos.

Change-Id: I264a0104aaf9ad8b927126cb523a4e8df9c5e6b7
(cherry picked from commit 19c71e92d1)
This commit is contained in:
Alfredo Moralejo 2020-11-10 10:23:05 +01:00 committed by yatinkarel
parent 7ef539bc37
commit 20d8eb9d43
4 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitreview
View File

@ -2,3 +2,4 @@
host=review.opendev.org
port=29418
project=x/packstack.git
defaultbranch=stable/victoria

8
.zuul.yaml
View File

@ -38,8 +38,8 @@
parent: packstack-base
vars:
selinux_enforcing: "false"
delorean: "https://trunk.rdoproject.org/centos8-master/puppet-passed-ci/delorean.repo"
delorean_deps: "https://trunk.rdoproject.org/centos8-master/delorean-deps.repo"
delorean: "https://trunk.rdoproject.org/centos8-victoria/current-passed-ci/delorean.repo"
delorean_deps: "https://trunk.rdoproject.org/centos8-victoria/delorean-deps.repo"
pre-run: playbooks/packstack-centos8-pre.yaml
nodeset:
nodes:
@ -52,8 +52,8 @@
parent: packstack-base
vars:
selinux_enforcing: "false"
delorean: "https://trunk.rdoproject.org/centos8-master/puppet-passed-ci/delorean.repo"
delorean_deps: "https://trunk.rdoproject.org/centos8-master/delorean-deps.repo"
delorean: "https://trunk.rdoproject.org/centos8-victoria/current-passed-ci/delorean.repo"
delorean_deps: "https://trunk.rdoproject.org/centos8-victoria/delorean-deps.repo"
pre-run: playbooks/packstack-centos8-pre.yaml
nodeset:
nodes:

48
Puppetfile
View File

@ -4,99 +4,99 @@ moduledir '/usr/share/openstack-puppet/modules'
mod 'aodh',
:git => 'https://github.com/openstack/puppet-aodh',
:ref => 'master'
:ref => 'stable/victoria'
mod 'ceilometer',
:git => 'https://github.com/openstack/puppet-ceilometer',
:ref => 'master'
:ref => 'stable/victoria'
mod 'cinder',
:git => 'https://github.com/openstack/puppet-cinder',
:ref => 'master'
:ref => 'stable/victoria'
mod 'glance',
:git => 'https://github.com/openstack/puppet-glance',
:ref => 'master'
:ref => 'stable/victoria'
mod 'gnocchi',
:git => 'https://github.com/openstack/puppet-gnocchi',
:ref => 'master'
:ref => 'stable/victoria'
mod 'heat',
:git => 'https://github.com/openstack/puppet-heat',
:ref => 'master'
:ref => 'stable/victoria'
mod 'magnum',
:git => 'https://github.com/openstack/puppet-magnum',
:ref => 'master'
:ref => 'stable/victoria'
mod 'horizon',
:git => 'https://github.com/openstack/puppet-horizon',
:ref => 'master'
:ref => 'stable/victoria'
mod 'ironic',
:git => 'https://github.com/openstack/puppet-ironic',
:ref => 'master'
:ref => 'stable/victoria'
mod 'keystone',
:git => 'https://github.com/openstack/puppet-keystone',
:ref => 'master'
:ref => 'stable/victoria'
mod 'manila',
:git => 'https://github.com/openstack/puppet-manila',
:ref => 'master'
:ref => 'stable/victoria'
mod 'neutron',
:git => 'https://github.com/openstack/puppet-neutron',
:ref => 'master'
:ref => 'stable/victoria'
mod 'nova',
:git => 'https://github.com/openstack/puppet-nova',
:ref => 'master'
:ref => 'stable/victoria'
mod 'openstack_extras',
:git => 'https://github.com/openstack/puppet-openstack_extras',
:ref => 'master'
:ref => 'stable/victoria'
mod 'openstacklib',
:git => 'https://github.com/openstack/puppet-openstacklib',
:ref => 'master'
:ref => 'stable/victoria'
mod 'oslo',
:git => 'https://github.com/openstack/puppet-oslo',
:ref => 'master'
:ref => 'stable/victoria'
mod 'ovn',
:git => 'https://github.com/openstack/puppet-ovn',
:ref => 'master'
:ref => 'stable/victoria'
mod 'panko',
:git => 'https://github.com/openstack/puppet-panko',
:ref => 'master'
:ref => 'stable/victoria'
mod 'placement',
:git => 'https://github.com/openstack/puppet-placement',
:ref => 'master'
:ref => 'stable/victoria'
mod 'sahara',
:git => 'https://github.com/openstack/puppet-sahara',
:ref => 'master'
:ref => 'stable/victoria'
mod 'swift',
:git => 'https://github.com/openstack/puppet-swift',
:ref => 'master'
:ref => 'stable/victoria'
mod 'tempest',
:git => 'https://github.com/openstack/puppet-tempest',
:ref => 'master'
:ref => 'stable/victoria'
mod 'trove',
:git => 'https://github.com/openstack/puppet-trove',
:ref => 'master'
:ref => 'stable/victoria'
mod 'vswitch',
:git => 'https://github.com/openstack/puppet-vswitch',
:ref => 'master'
:ref => 'stable/victoria'
## Non-OpenStack modules

9
run_tests.sh
View File

@ -17,7 +17,7 @@ export PATH=$PATH:/usr/local/sbin:/usr/sbin
SCENARIO=${SCENARIO:-scenario001}
BRANCH=master
BRANCH=stable/victoria
# Find OS version and release
source /etc/os-release
@ -26,8 +26,8 @@ OS_NAME_VERS=${REDHAT_SUPPORT_PRODUCT}${REDHAT_SUPPORT_PRODUCT_VERSION}
# We could want to override the default repositories or install behavior
INSTALL_FROM_SOURCE=${INSTALL_FROM_SOURCE:-true}
MANAGE_REPOS=${MANAGE_REPOS:-true}
DELOREAN=${DELOREAN:-https://trunk.rdoproject.org/${OS_NAME_VERS}-master/current-passed-ci/delorean.repo}
DELOREAN_DEPS=${DELOREAN_DEPS:-https://trunk.rdoproject.org/${OS_NAME_VERS}-master/delorean-deps.repo}
DELOREAN=${DELOREAN:-https://trunk.rdoproject.org/${OS_NAME_VERS}-victoria/current-passed-ci/delorean.repo}
DELOREAN_DEPS=${DELOREAN_DEPS:-https://trunk.rdoproject.org/${OS_NAME_VERS}-victoria/delorean-deps.repo}
GIT_BASE_URL=${GIT_BASE_URL:-https://git.openstack.org}
ADDITIONAL_ARGS=${ADDITIONAL_ARGS:-}
SELINUX_ENFORCING=${SELINUX_ENFORCING:-true}
@ -179,6 +179,7 @@ OS_VERSION=$(facter operatingsystemmajrelease)
if ([ "$OS_NAME" = "RedHat" ] || [ "$OS_NAME" = "CentOS" ]) && [ $OS_VERSION -gt 7 ]; then
$SUDO $PKG_MGR -y install python3-setuptools \
python3-devel \
python3-wheel \
python3-pyyaml
else
$SUDO $PKG_MGR -y install python-setuptools \
@ -190,7 +191,7 @@ fi
which pip3 && PIP=pip3
if [ -z $PIP ]; then
if ([ "$OS_NAME" = "RedHat" ] || [ "$OS_NAME" = "CentOS" ]) && [ $OS_VERSION -gt 7 ]; then
$SUDO $PKG_MGR -y install python3-pip
$SUDO $PKG_MGR -y install python3-pip python3-wheel
PIP=pip3
else
which pip || $SUDO easy_install pip