openstack/horizon
Code Issues Proposed changes

Bump XStatic-JQuery to make it work with jquery-migrate

Browse Source 
The jquery-migrate 3 requires newer jquery than we have.
Also added all the other fixes for integration tests to see
if that resolves our problems.

This needs to be merge first so that patch which update the
upper bump of XStatic-JQuery in openstack/requiremensts [1]
can be merged.

Note: This patch also make horizon-integration job to non-voting
so that we can merge this patch and once openstack/requirements
[1] patch is merged, we will make horizon-integartion job voting
again

[1] https://review.opendev.org/c/openstack/requirements/+/887933

Co-Author-By: manchandavishal <manchandavishal143@gmail.com>

Change-Id: I9b8a5e8abe734e7fd99aa0066ede0377e34fbf44
This commit is contained in:
Radomir Dopieralski 2023-07-04 08:48:18 +02:00 committed by manchandavishal
parent ea53235c85
commit 480aba9422
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.zuul.d/project.yaml
View File

@ -12,7 +12,8 @@
check:
jobs:
- horizon-selenium-headless
- horizon-integration-tests
- horizon-integration-tests:
voting: false
- horizon-dsvm-tempest-plugin
- horizon-tox-bandit-baseline
- horizon-tempest-plugin-ipv6
@ -20,7 +21,8 @@
jobs:
- horizon-dsvm-tempest-plugin
- horizon-selenium-headless
- horizon-integration-tests
- horizon-integration-tests:
voting: false
- horizon-tempest-plugin-ipv6
experimental:
jobs:

2
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.html
View File

@ -26,7 +26,7 @@
</hz-dynamic-table>
</transfer-table> <!-- End Key Pairs Table -->
<settings-service hz-if-settings="["OPENSTACK_HYPERVISOR_FEATURES.can_set_password"]">
<settings-service hz-if-settings="[&quot;OPENSTACK_HYPERVISOR_FEATURES.can_set_password&quot;]">
<div class="admin-password">
<div class="themable-checkbox">
<input ng-change="ctrl.setAdminPasswordChange()"

8
openstack_dashboard/test/integration_tests/config.py
View File

@ -75,11 +75,11 @@ ImageGroup = [
default='angular',
help='type/version of images panel'),
cfg.StrOpt('http_image',
default='http://download.cirros-cloud.net/0.5.2/'
'cirros-0.5.2-x86_64-uec.tar.gz',
default='http://download.cirros-cloud.net/0.6.2/'
'cirros-0.6.2-x86_64-uec.tar.gz',
help='http accessible image'),
cfg.ListOpt('images_list',
default=['cirros-0.5.2-x86_64-disk'],
default=['cirros-0.6.2-x86_64-disk'],
help='default list of images')
]
@ -148,7 +148,7 @@ InstancesGroup = [
default='nova',
help='Availability zone to be selected for launch instances'),
cfg.StrOpt('image_name',
default='cirros-0.5.2-x86_64-disk (15.5 MB)',
default='cirros-0.6.2-x86_64-disk (20.4 MB)',
help='Boot Source to be selected for launch Instances'),
cfg.StrOpt('flavor',
default='m1.tiny',

7
openstack_dashboard/test/integration_tests/horizon.conf
View File

@ -43,9 +43,8 @@ panel_type=legacy
[image]
# http accessible image (string value)
panel_type=angular
http_image=http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-uec.tar.gz
images_list=cirros-0.5.2-x86_64-disk
http_image=http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-uec.tar.gz
images_list=cirros-0.6.2-x86_64-disk
[identity]
# Username to use for non-admin API requests. (string value)
@ -98,7 +97,7 @@ ssh_user=cirros
#available zone to launch instances
available_zone=nova
#image_name to launch instances
image_name=cirros-0.5.2-x86_64-disk (15.5 MB)
image_name=cirros-0.6.2-x86_64-disk (20.4 MB)
#flavor to launch instances
flavor=m1.tiny

4
requirements.txt
View File

@ -59,8 +59,8 @@ XStatic-D3>=3.5.17.0 # BSD License (3 clause)
XStatic-Hogan>=2.0.0.2 # Apache 2.0 License
XStatic-Font-Awesome>=4.7.0.0 # SIL OFL 1.1 License, MIT License
XStatic-Jasmine>=2.4.1.1 # MIT License
XStatic-jQuery>=1.12.4.1,<2 # MIT License
XStatic-JQuery-Migrate>=1.2.1.1 # MIT License
XStatic-jQuery>=1.12.4.1,<3.6 # MIT License
XStatic-JQuery-Migrate>=3 # MIT License
XStatic-JQuery.quicksearch>=2.0.3.1 # MIT License
XStatic-JQuery.TableSorter>=2.14.5.1 # MIT License
XStatic-jquery-ui>=1.12.1.1 # MIT License