Use constraints when creating tempest venv
When running tempest we run in-tree tests as well. Lots of these tests including tempest tests may not work with new client libraries. Let's use the relevant branch upper constraints when running functional tests. Backport note: Change I7d1017bcd7147329c4e187336daee1a1ae280fa9, which replaced f33 by f66, is merged into this backport to unblock CI. Backport notes to ussuri: - Change I703229320320295b4a90e72c543f8959f85daaa9, which removed l-c job is merged into this backport because the job is failing now. - Change Ibe60d1e536f0e887eceea32b7cb4eec6318e96af is partially pulled into this change to fix the requirements-check job. - This change was adjusted to avoid config error in zuul. The grenade job is already made non-voting in stable/ussuri. Change-Id: I6a8cffdc86c895eebe4269c5cd37841325566c54 (cherry picked from commit22c48f57bb
) (cherry picked from commitb95e6025f6
) (cherry picked from commit92db02a56e
) (cherry picked from commitd05b683ef6
) (cherry picked from commit87b40ed75e
)
This commit is contained in:
parent
5fb64c0058
commit
f3d895e960
|
@ -79,7 +79,7 @@
|
|||
minimal_image_ref: ${DEFAULT_IMAGE_NAME:-cirros-0.3.6-x86_64-disk}
|
||||
instance_type: m1.heat_int
|
||||
minimal_instance_type: m1.heat_micro
|
||||
image_ref: Fedora-Cloud-Base-33-1.2.x86_64
|
||||
image_ref: Fedora-Cloud-Base-36-1.5.x86_64
|
||||
hidden_stack_tag: hidden
|
||||
heat_config_notify_script: /opt/stack/heat-agents/heat-config/bin/heat-config-notify
|
||||
boot_config_env: /opt/stack/heat-templates/hot/software-config/boot-config/test_image_env.yaml
|
||||
|
@ -168,7 +168,6 @@
|
|||
- project:
|
||||
templates:
|
||||
- openstack-cover-jobs
|
||||
- openstack-lower-constraints-jobs
|
||||
- openstack-python3-ussuri-jobs
|
||||
- periodic-stable-jobs
|
||||
- publish-openstack-docs-pti
|
||||
|
|
|
@ -453,7 +453,7 @@ function configure_tempest_for_heat {
|
|||
# Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
|
||||
iniset $TEMPEST_CONFIG heat_plugin skip_functional_test_list 'LoadBalancerv2Test, NotificationTest'
|
||||
|
||||
openstack flavor show m1.heat_int || openstack flavor create m1.heat_int --ram 512 --disk 4
|
||||
openstack flavor show m1.heat_int || openstack flavor create m1.heat_int --ram 512 --disk 10
|
||||
openstack flavor show m1.heat_micro || openstack flavor create m1.heat_micro --ram 128 --disk 1
|
||||
|
||||
source $TOP_DIR/openrc demo demo
|
||||
|
@ -482,14 +482,14 @@ function configure_tempest_for_heat {
|
|||
source /etc/ci/mirror_info.sh
|
||||
fi
|
||||
HEAT_TEST_FEDORA_IMAGE_UPSTREAM=https://download.fedoraproject.org/pub/fedora/linux
|
||||
HEAT_TEST_FEDORA_IMAGE_PATH=releases/33/Cloud/x86_64/images/Fedora-Cloud-Base-33-1.2.x86_64.qcow2
|
||||
HEAT_TEST_FEDORA_IMAGE_PATH=releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2
|
||||
if curl --output /dev/null --silent --head --fail "${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}"; then
|
||||
export HEAT_TEST_FEDORA_IMAGE="${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}"
|
||||
else
|
||||
export HEAT_TEST_FEDORA_IMAGE="${HEAT_TEST_FEDORA_IMAGE_UPSTREAM}/${HEAT_TEST_FEDORA_IMAGE_PATH}"
|
||||
fi
|
||||
TOKEN=$(openstack token issue -c id -f value)
|
||||
local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-33-1.2.x86_64" )
|
||||
local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-36-1.5.x86_64" )
|
||||
if [[ -z $image_exists ]]; then
|
||||
if is_service_enabled g-api; then
|
||||
upload_image $HEAT_TEST_FEDORA_IMAGE $TOKEN
|
||||
|
|
|
@ -51,8 +51,8 @@ a VM image that heat can launch. To do that add the following to
|
|||
`[[local|localrc]]` section of `local.conf`::
|
||||
|
||||
IMAGE_URL_SITE="https://download.fedoraproject.org"
|
||||
IMAGE_URL_PATH="/pub/fedora/linux/releases/33/Cloud/x86_64/images/"
|
||||
IMAGE_URL_FILE="Fedora-Cloud-Base-33-1.2.x86_64.qcow2"
|
||||
IMAGE_URL_PATH="/pub/fedora/linux/releases/36/Cloud/x86_64/images/"
|
||||
IMAGE_URL_FILE="Fedora-Cloud-Base-36-1.5.x86_64.qcow2"
|
||||
IMAGE_URLS+=","$IMAGE_URL_SITE$IMAGE_URL_PATH$IMAGE_URL_FILE
|
||||
|
||||
URLs for any cloud image may be specified, but fedora images from F20 contain
|
||||
|
|
|
@ -30,4 +30,4 @@ openstack flavor delete m1.heat_int
|
|||
openstack flavor delete m1.heat_micro
|
||||
|
||||
# delete the image created
|
||||
openstack image delete Fedora-Cloud-Base-33-1.2.x86_64
|
||||
openstack image delete Fedora-Cloud-Base-36-1.5.x86_64
|
||||
|
|
|
@ -46,7 +46,7 @@ function _config_iniset {
|
|||
iniset $conf_file heat_plugin instance_type m1.heat_int
|
||||
iniset $conf_file heat_plugin minimal_instance_type m1.heat_micro
|
||||
|
||||
iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-33-1.2.x86_64
|
||||
iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-36-1.5.x86_64
|
||||
iniset $conf_file heat_plugin minimal_image_ref $default_image_name
|
||||
iniset $conf_file heat_plugin hidden_stack_tag hidden
|
||||
|
||||
|
|
|
@ -1,159 +0,0 @@
|
|||
alembic==0.9.8
|
||||
amqp==2.2.2
|
||||
aodhclient==0.9.0
|
||||
appdirs==1.4.3
|
||||
asn1crypto==0.24.0
|
||||
Babel==2.3.4
|
||||
bandit==1.1.0
|
||||
bcrypt==3.1.4
|
||||
cachetools==2.0.1
|
||||
certifi==2018.1.18
|
||||
cffi==1.11.5
|
||||
chardet==3.0.4
|
||||
cliff==2.11.0
|
||||
cmd2==0.8.1
|
||||
contextlib2==0.5.5
|
||||
coverage==4.0
|
||||
croniter==0.3.4
|
||||
cryptography==2.1.4
|
||||
debtcollector==1.19.0
|
||||
decorator==4.2.1
|
||||
deprecation==2.0
|
||||
doc8==0.6.0
|
||||
docker-pycreds==0.2.2
|
||||
docker==3.1.1
|
||||
dogpile.cache==0.6.5
|
||||
enum-compat==0.0.2
|
||||
eventlet==0.18.2
|
||||
extras==1.0.0
|
||||
fasteners==0.14.1
|
||||
fixtures==3.0.0
|
||||
future==0.16.0
|
||||
futurist==1.6.0
|
||||
gitdb2==2.0.3
|
||||
GitPython==2.1.8
|
||||
greenlet==0.4.13
|
||||
idna==2.6
|
||||
iso8601==0.1.12
|
||||
Jinja2==2.10
|
||||
jmespath==0.9.3
|
||||
jsonpatch==1.21
|
||||
jsonpointer==2.0
|
||||
jsonschema==2.6.0
|
||||
keystoneauth1==3.18.0
|
||||
keystonemiddleware==4.17.0
|
||||
kombu==4.0.0
|
||||
linecache2==1.0.0
|
||||
lxml==3.4.1
|
||||
Mako==1.0.7
|
||||
MarkupSafe==1.0
|
||||
mccabe==0.6.0
|
||||
mock==2.0.0
|
||||
monotonic==1.4
|
||||
msgpack==0.5.6
|
||||
munch==2.2.0
|
||||
netaddr==0.7.18
|
||||
netifaces==0.10.6
|
||||
neutron-lib==1.14.0
|
||||
openstacksdk==0.11.2
|
||||
os-client-config==1.29.0
|
||||
os-service-types==1.2.0
|
||||
osc-lib==1.10.0
|
||||
oslo.cache==1.26.0
|
||||
oslo.concurrency==3.26.0
|
||||
oslo.config==5.2.0
|
||||
oslo.context==2.19.2
|
||||
oslo.db==4.27.0
|
||||
oslo.i18n==3.15.3
|
||||
oslo.log==3.36.0
|
||||
oslo.messaging==5.29.0
|
||||
oslo.middleware==3.31.0
|
||||
oslo.policy==1.30.0
|
||||
oslo.reports==1.18.0
|
||||
oslo.serialization==2.18.0
|
||||
oslo.service==1.24.0
|
||||
oslo.upgradecheck==0.1.0
|
||||
oslo.utils==3.37.0
|
||||
oslo.versionedobjects==1.31.2
|
||||
oslotest==3.2.0
|
||||
osprofiler==1.4.0
|
||||
packaging==17.1
|
||||
paramiko==2.4.1
|
||||
Paste==2.0.3
|
||||
PasteDeploy==1.5.0
|
||||
pbr==2.0.0
|
||||
pika-pool==0.1.3
|
||||
pika==0.10.0
|
||||
ply==3.11
|
||||
prettytable==0.7.2
|
||||
psutil==5.4.3
|
||||
psycopg2==2.7
|
||||
pyasn1==0.4.2
|
||||
pycadf==2.7.0
|
||||
pycparser==2.18
|
||||
Pygments==2.2.0
|
||||
pyinotify==0.9.6
|
||||
PyMySQL==0.7.6
|
||||
PyNaCl==1.2.1
|
||||
pyOpenSSL==17.5.0
|
||||
pyparsing==2.2.0
|
||||
pyperclip==1.6.0
|
||||
python-barbicanclient==4.5.2
|
||||
python-blazarclient===1.0.1
|
||||
python-ceilometerclient==2.5.0
|
||||
python-cinderclient==3.3.0
|
||||
python-dateutil==2.7.0
|
||||
python-designateclient==2.7.0
|
||||
python-editor==1.0.3
|
||||
python-glanceclient==2.8.0
|
||||
python-heatclient==1.10.0
|
||||
python-ironicclient==2.8.0
|
||||
python-keystoneclient==3.8.0
|
||||
python-magnumclient==2.3.0
|
||||
python-manilaclient==1.16.0
|
||||
python-mimeparse==1.6.0
|
||||
python-mistralclient==3.1.0
|
||||
python-monascaclient==1.12.0
|
||||
python-neutronclient==6.14.0
|
||||
python-novaclient==9.1.0
|
||||
python-octaviaclient==1.8.0
|
||||
python-openstackclient==3.12.0
|
||||
python-saharaclient==1.4.0
|
||||
python-subunit==1.2.0
|
||||
python-swiftclient==3.2.0
|
||||
python-troveclient==2.2.0
|
||||
python-vitrageclient==2.7.0
|
||||
python-zaqarclient==1.3.0
|
||||
python-zunclient==3.4.0
|
||||
pytz==2013.6
|
||||
PyYAML==3.12
|
||||
repoze.lru==0.7
|
||||
requests==2.14.2
|
||||
requestsexceptions==1.4.0
|
||||
rfc3986==1.1.0
|
||||
Routes==2.3.1
|
||||
simplejson==3.13.2
|
||||
six==1.10.0
|
||||
smmap2==2.0.3
|
||||
sqlalchemy-migrate==0.11.0
|
||||
SQLAlchemy==1.0.10
|
||||
sqlparse==0.2.4
|
||||
statsd==3.2.2
|
||||
stestr==2.0.0
|
||||
stevedore==1.20.0
|
||||
tempest==17.1.0
|
||||
Tempita==0.5.2
|
||||
tenacity==4.4.0
|
||||
testresources==2.0.0
|
||||
testscenarios==0.4
|
||||
testtools==2.2.0
|
||||
traceback2==1.4.0
|
||||
unittest2==1.1.0
|
||||
urllib3==1.22
|
||||
vine==1.1.4
|
||||
voluptuous==0.11.1
|
||||
warlock==1.2.0
|
||||
WebOb==1.7.1
|
||||
websocket-client==0.47.0
|
||||
wrapt==1.10.11
|
||||
yaql==1.1.3
|
|
@ -1,3 +1,7 @@
|
|||
# Requirements lower bounds listed here are our best effort to keep them up to
|
||||
# date but we do not test them so no guarantee of having them all correct. If
|
||||
# you find any incorrect lower bounds, let us know or propose a fix.
|
||||
|
||||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
|
|
|
@ -1,2 +1,5 @@
|
|||
devstack_base_dir: /opt/stack
|
||||
tempest_test_timeout: ''
|
||||
tempest_tox_environment: {}
|
||||
heat_tempest_plugin: /opt/stack/heat-tempest-plugin
|
||||
constraints_file: /opt/stack/requirements/upper-constraints.txt
|
||||
|
|
|
@ -1,3 +1,23 @@
|
|||
- name: Set OS_TEST_TIMEOUT if requested
|
||||
set_fact:
|
||||
tempest_tox_environment: "{{ tempest_tox_environment | combine({'OS_TEST_TIMEOUT': tempest_test_timeout}) }}"
|
||||
when: tempest_test_timeout != ''
|
||||
|
||||
- name: Set TOX_CONSTRAINTS_FILE
|
||||
set_fact:
|
||||
tempest_tox_environment: "{{ tempest_tox_environment | combine({'UPPER_CONSTRAINTS_FILE': constraints_file}) | combine({'TOX_CONSTRAINTS_FILE': constraints_file}) }}"
|
||||
|
||||
- name: Allow git to read plugin directories
|
||||
become: true
|
||||
command: git config --system --add safe.directory {{heat_tempest_plugin}}
|
||||
|
||||
- name: Install plugins
|
||||
command: tox -evenv-tempest -- pip install -c{{constraints_file}} {{heat_tempest_plugin}}
|
||||
become: true
|
||||
args:
|
||||
chdir: "{{devstack_base_dir}}/tempest"
|
||||
environment: "{{ tempest_tox_environment }}"
|
||||
|
||||
- name: Run heat tests
|
||||
command: tox -evenv-tempest -- stestr --test-path={{devstack_base_dir}}/heat/heat_integrationtests \
|
||||
--top-dir={{devstack_base_dir}}/heat \
|
||||
|
@ -5,5 +25,4 @@
|
|||
args:
|
||||
chdir: "{{devstack_base_dir}}/tempest"
|
||||
become: true
|
||||
become_user: tempest
|
||||
environment: '{{ {"OS_TEST_TIMEOUT": tempest_test_timeout} if tempest_test_timeout else {} }}'
|
||||
environment: "{{ tempest_tox_environment }}"
|
||||
|
|
|
@ -23,8 +23,8 @@ sudo -H mysqladmin -u root password $DB_ROOT_PW
|
|||
sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e "
|
||||
DELETE FROM mysql.user WHERE User='';
|
||||
FLUSH PRIVILEGES;
|
||||
GRANT ALL PRIVILEGES ON *.*
|
||||
TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;"
|
||||
CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW';
|
||||
GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;"
|
||||
|
||||
# Now create our database.
|
||||
mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "
|
||||
|
|
Loading…
Reference in New Issue