Move integration jobs to Ubuntu 22.04 (Jammy)

I noticed the confluent-kafka package isn't compatible with the version
of librdkafka-dev provided on Jammy [1][2]. Thankfully they provide a
binary wheel though.

[1] https://github.com/confluentinc/confluent-kafka-python/blob/v1.9.2/src/confluent_kafka/src/confluent_kafka.h#L59
[2] https://packages.ubuntu.com/jammy/librdkafka-dev

Change-Id: If55f246d9d2a990f2389d14d7bda22a82d9bb43c
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2023-01-13 12:00:27 +00:00 committed by Takashi Kajinami
parent 8759cd7d9a
commit d16cddd822
3 changed files with 23 additions and 42 deletions

View File

@ -1,35 +1,34 @@
- job: - job:
name: oslo.messaging-tox-py38-func-scenario01 name: oslo.messaging-tox-py310-func-scenario01
parent: openstack-tox-py38 parent: openstack-tox-py310
vars: vars:
tox_envlist: py38-func-scenario01 tox_envlist: py310-func-scenario01
bindep_profile: rabbit bindep_profile: rabbit
- job: - job:
name: oslo.messaging-tox-py38-func-scenario02 name: oslo.messaging-tox-py310-func-scenario02
parent: openstack-tox-py38 parent: openstack-tox-py310
vars: vars:
tox_envlist: py38-func-scenario02 tox_envlist: py310-func-scenario02
bindep_profile: rabbit kafka amqp1 bindep_profile: rabbit kafka amqp1
- job: - job:
name: oslo.messaging-tox-py38-func-scenario03 name: oslo.messaging-tox-py310-func-scenario03
parent: openstack-tox-py38 parent: openstack-tox-py310
vars: vars:
tox_envlist: py38-func-scenario03 tox_envlist: py310-func-scenario03
bindep_profile: rabbit amqp1 bindep_profile: rabbit amqp1
- job: - job:
name: oslo.messaging-tox-py38-func-scenario04 name: oslo.messaging-tox-py310-func-scenario04
parent: openstack-tox-py38 parent: openstack-tox-py310
vars: vars:
tox_envlist: py38-func-scenario04 tox_envlist: py310-func-scenario04
bindep_profile: kafka amqp1 bindep_profile: kafka amqp1
# Begin v3 native jobs # Begin v3 native jobs
# See https://docs.openstack.org/devstack/latest/ # See https://docs.openstack.org/devstack/latest/
- job: - job:
name: oslo.messaging-devstack-tempest-full-base name: oslo.messaging-devstack-tempest-full-base
description: | description: |
@ -43,14 +42,12 @@
vars: vars:
tox_envlist: full tox_envlist: full
- job: - job:
name: oslo.messaging-src-dsvm-full-rabbit name: oslo.messaging-src-dsvm-full-rabbit
description: | description: |
Run full tempest tests against rabbitmq Run full tempest tests against rabbitmq
parent: oslo.messaging-devstack-tempest-full-base parent: oslo.messaging-devstack-tempest-full-base
- job: - job:
name: oslo.messaging-src-dsvm-full-amqp1-hybrid name: oslo.messaging-src-dsvm-full-amqp1-hybrid
description: | description: |
@ -67,7 +64,6 @@
zuul_copy_output: zuul_copy_output:
'{{ devstack_log_dir }}/qdrouterd.log': logs '{{ devstack_log_dir }}/qdrouterd.log': logs
- job: - job:
name: oslo.messaging-src-dsvm-full-kafka-hybrid name: oslo.messaging-src-dsvm-full-kafka-hybrid
description: | description: |
@ -102,7 +98,6 @@
- ^(test-|)requirements.txt$ - ^(test-|)requirements.txt$
- ^setup.cfg$ - ^setup.cfg$
- project: - project:
templates: templates:
- check-requirements - check-requirements
@ -114,12 +109,12 @@
- release-notes-jobs-python3 - release-notes-jobs-python3
check: check:
jobs: jobs:
- oslo.messaging-tox-py38-func-scenario01 - oslo.messaging-tox-py310-func-scenario01
- oslo.messaging-tox-py38-func-scenario02: - oslo.messaging-tox-py310-func-scenario02:
voting: false voting: false
- oslo.messaging-tox-py38-func-scenario03: - oslo.messaging-tox-py310-func-scenario03:
voting: false voting: false
- oslo.messaging-tox-py38-func-scenario04: - oslo.messaging-tox-py310-func-scenario04:
voting: false voting: false
- oslo.messaging-src-dsvm-full-rabbit - oslo.messaging-src-dsvm-full-rabbit
- oslo.messaging-src-dsvm-full-amqp1-hybrid: - oslo.messaging-src-dsvm-full-amqp1-hybrid:
@ -130,8 +125,7 @@
voting: false voting: false
- oslo.messaging-grenade-multinode: - oslo.messaging-grenade-multinode:
voting: false voting: false
gate: gate:
jobs: jobs:
- oslo.messaging-tox-py38-func-scenario01 - oslo.messaging-tox-py310-func-scenario01
- oslo.messaging-src-dsvm-full-rabbit - oslo.messaging-src-dsvm-full-rabbit

View File

@ -21,22 +21,9 @@ sasl2-bin [platform:dpkg amqp1 test]
uuid-dev [platform:dpkg amqp1 test] uuid-dev [platform:dpkg amqp1 test]
swig [platform:dpkg amqp1 test] swig [platform:dpkg amqp1 test]
libsasl2-modules [platform:dpkg amqp1 test] libsasl2-modules [platform:dpkg amqp1 test]
openjdk-8-jdk [platform:dpkg amqp1 test !platform:debian] default-jdk [platform:dpkg amqp1 test !platform:debian]
# AMQP1 TEST rpm
qpid-dispatch-router [platform:rpm amqp1 test]
python-qpid-proton [platform:rpm amqp1 test]
cyrus-sasl-lib [platform:rpm amqp1 test]
cyrus-sasl-plain [platform:rpm amqp1 test]
libuuid-devel [platform:rpm amqp1 test]
swig [platform:rpm amqp1 test]
java-1.8.0-openjdk [platform:rpm amqp1 test]
# kafka dpkg # kafka dpkg
openjdk-8-jdk [platform:dpkg kafka] default-jdk [platform:dpkg kafka]
librdkafka1 [platform:dpkg kafka] librdkafka1 [platform:dpkg kafka]
librdkafka-dev [platform:dpkg kafka] librdkafka-dev [platform:dpkg kafka]
# kafka rpm
java-1.8.0-openjdk [platform:rpm kafka]
librdkafka [platform:rpm kafka]

View File

@ -52,7 +52,7 @@ commands =
# scenario03 amqp rabbit # scenario03 amqp rabbit
# scenario04 amqp kafka # scenario04 amqp kafka
# #
[testenv:py38-func-scenario01] [testenv:py310-func-scenario01]
setenv = setenv =
SCENARIO=scenario01 SCENARIO=scenario01
allowlist_externals = allowlist_externals =
@ -60,7 +60,7 @@ allowlist_externals =
commands = commands =
{toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py38-func-scenario02] [testenv:py310-func-scenario02]
setenv = setenv =
SCENARIO=scenario02 SCENARIO=scenario02
allowlist_externals = allowlist_externals =
@ -68,7 +68,7 @@ allowlist_externals =
commands = commands =
{toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py38-func-scenario03] [testenv:py310-func-scenario03]
setenv = setenv =
SCENARIO=scenario03 SCENARIO=scenario03
ENVNAME={envname} ENVNAME={envname}
@ -78,7 +78,7 @@ allowlist_externals =
commands = commands =
{toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
[testenv:py38-func-scenario04] [testenv:py310-func-scenario04]
setenv = setenv =
SCENARIO=scenario04 SCENARIO=scenario04
ENVNAME={envname} ENVNAME={envname}