Skip to content

Commit b7a59a5

Browse files
committed
Switch fullstack/functional fips jobs to 9-stream
Master no longer support py3.6, so let's switch these jobs to CentOS 9-stream which includes py3.9. Also dbcounter[1] is not installable on CentOS 8-stream and hence these jobs are currently broken. Other fips jobs already switched with[2]. [1] https://review.opendev.org/c/openstack/devstack/+/839820 [2] https://review.opendev.org/c/openstack/neutron/+/833173 [Stable Only] The switch is to match defined runtimes per release https://governance.openstack.org/tc/reference/runtimes/ Closes-Bug: #1976323 Change-Id: Ie4e807b1490d59390316ec20b499b7676acfe410 (cherry picked from commit 42ae944)
1 parent 7013fc5 commit b7a59a5

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

neutron/tests/fullstack/test_l3_agent.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,11 @@ def test_north_south_traffic(self):
395395
v6network = self.useFixture(
396396
ip_network.ExclusiveIPNetwork(
397397
"2001:db8:1234::1", "2001:db8:1234::10", "64")).network
398+
# NOTE(ykarel): gateway_ip is explicitly added as iputils package
399+
# requires fix for https://github.com/iputils/iputils/issues/371
400+
# is not available in CentOS 9-Stream
398401
ext_v6sub = self.safe_client.create_subnet(
399-
tenant_id, ext_net['id'], v6network)
402+
tenant_id, ext_net['id'], v6network, gateway_ip='2001:db8:1234::1')
400403

401404
router = self.safe_client.create_router(tenant_id,
402405
external_network=ext_net['id'])

neutron/tests/fullstack/test_local_ip.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# License for the specific language governing permissions and limitations
1414
# under the License.
1515

16+
import time
17+
1618
from neutron_lib import constants
1719
from oslo_utils import uuidutils
1820

@@ -119,5 +121,9 @@ def test_vm_is_accessible_by_local_ip(self):
119121
# VM on different host shouldn't have access to this Local IP
120122
vms[2].assert_no_ping(local_ip['local_ip_address'])
121123

124+
# NOTE(ykarel): response comes from local_ip assigned to vm0,
125+
# as a workaround sleep for arp cache expiry. It requires
126+
# fix in Local IP feature
127+
time.sleep(31)
122128
# check that VMs can still access each other with fixed IPs
123129
vms.ping_all()

roles/configure_functional_tests/tasks/main.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,15 @@
2727
MYSQL_GATHER_PERFORMANCE={{ MYSQL_GATHER_PERFORMANCE | default(true) }}
2828
2929
source $NEUTRON_DIR/tools/configure_for_func_testing.sh
30-
3130
if is_fedora; then
3231
# NOTE(slqweq) Running functional job e.g. on Centos requires to
3332
# have repo with rabbitmq-server and some other packages available
34-
install_package centos-release-openstack-victoria
33+
OPENSTACK_RELEASE=victoria
34+
# For CentOS 9-Stream need to setup yoga repos
35+
if [[ $os_VENDOR == "CentOSStream" && $os_RELEASE -gt 8 ]]; then
36+
OPENSTACK_RELEASE=yoga
37+
fi
38+
install_package centos-release-openstack-${OPENSTACK_RELEASE}
3539
install_package iproute-tc haproxy keepalived
3640
3741
# NOTE(slaweq) On Fedora/CentOS systems make sure that SELinux is

zuul.d/base.yaml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -127,35 +127,25 @@
127127
- job:
128128
name: neutron-functional-with-uwsgi-fips
129129
parent: neutron-functional-with-uwsgi
130-
nodeset: devstack-single-node-centos-8-stream
130+
nodeset: devstack-single-node-centos-9-stream
131131
description: |
132-
Functional testing for a FIPS enabled Centos 8 system
132+
Functional testing for a FIPS enabled Centos 9 system
133133
vars:
134134
nslookup_target: 'opendev.org'
135135
enable_fips: True
136-
# NOTE(ykarel) Remove MYSQL_GATHER_PERFORMANCE and
137-
# tox_environment when this job switches to centos-9-stream
138-
MYSQL_GATHER_PERFORMANCE: false
139-
tox_environment:
140-
TOX_PYTHON: python3.8
141136
devstack_localrc:
142137
ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256
143138
Q_BUILD_OVS_FROM_GIT: true
144139

145140
- job:
146141
name: neutron-fullstack-with-uwsgi-fips
147142
parent: neutron-fullstack-with-uwsgi
148-
nodeset: devstack-single-node-centos-8-stream
143+
nodeset: devstack-single-node-centos-9-stream
149144
description: |
150-
Functional testing for a FIPS enabled Centos 8 system
145+
Functional testing for a FIPS enabled Centos 9 system
151146
vars:
152147
nslookup_target: 'opendev.org'
153148
enable_fips: True
154-
# NOTE(ykarel) Remove MYSQL_GATHER_PERFORMANCE and
155-
# tox_environment when this job switches to centos-9-stream
156-
MYSQL_GATHER_PERFORMANCE: false
157-
tox_environment:
158-
TOX_PYTHON: python3.8
159149
devstack_localrc:
160150
ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256
161151
Q_BUILD_OVS_FROM_GIT: true

0 commit comments

Comments
 (0)