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
Takashi Kajinami
parent
8759cd7d9a
commit
d16cddd822
40
.zuul.yaml
40
.zuul.yaml
@ -1,35 +1,34 @@
|
||||
- job:
|
||||
name: oslo.messaging-tox-py38-func-scenario01
|
||||
parent: openstack-tox-py38
|
||||
name: oslo.messaging-tox-py310-func-scenario01
|
||||
parent: openstack-tox-py310
|
||||
vars:
|
||||
tox_envlist: py38-func-scenario01
|
||||
tox_envlist: py310-func-scenario01
|
||||
bindep_profile: rabbit
|
||||
|
||||
- job:
|
||||
name: oslo.messaging-tox-py38-func-scenario02
|
||||
parent: openstack-tox-py38
|
||||
name: oslo.messaging-tox-py310-func-scenario02
|
||||
parent: openstack-tox-py310
|
||||
vars:
|
||||
tox_envlist: py38-func-scenario02
|
||||
tox_envlist: py310-func-scenario02
|
||||
bindep_profile: rabbit kafka amqp1
|
||||
|
||||
- job:
|
||||
name: oslo.messaging-tox-py38-func-scenario03
|
||||
parent: openstack-tox-py38
|
||||
name: oslo.messaging-tox-py310-func-scenario03
|
||||
parent: openstack-tox-py310
|
||||
vars:
|
||||
tox_envlist: py38-func-scenario03
|
||||
tox_envlist: py310-func-scenario03
|
||||
bindep_profile: rabbit amqp1
|
||||
|
||||
- job:
|
||||
name: oslo.messaging-tox-py38-func-scenario04
|
||||
parent: openstack-tox-py38
|
||||
name: oslo.messaging-tox-py310-func-scenario04
|
||||
parent: openstack-tox-py310
|
||||
vars:
|
||||
tox_envlist: py38-func-scenario04
|
||||
tox_envlist: py310-func-scenario04
|
||||
bindep_profile: kafka amqp1
|
||||
|
||||
# Begin v3 native jobs
|
||||
# See https://docs.openstack.org/devstack/latest/
|
||||
|
||||
|
||||
- job:
|
||||
name: oslo.messaging-devstack-tempest-full-base
|
||||
description: |
|
||||
@ -43,14 +42,12 @@
|
||||
vars:
|
||||
tox_envlist: full
|
||||
|
||||
|
||||
- job:
|
||||
name: oslo.messaging-src-dsvm-full-rabbit
|
||||
description: |
|
||||
Run full tempest tests against rabbitmq
|
||||
parent: oslo.messaging-devstack-tempest-full-base
|
||||
|
||||
|
||||
- job:
|
||||
name: oslo.messaging-src-dsvm-full-amqp1-hybrid
|
||||
description: |
|
||||
@ -67,7 +64,6 @@
|
||||
zuul_copy_output:
|
||||
'{{ devstack_log_dir }}/qdrouterd.log': logs
|
||||
|
||||
|
||||
- job:
|
||||
name: oslo.messaging-src-dsvm-full-kafka-hybrid
|
||||
description: |
|
||||
@ -102,7 +98,6 @@
|
||||
- ^(test-|)requirements.txt$
|
||||
- ^setup.cfg$
|
||||
|
||||
|
||||
- project:
|
||||
templates:
|
||||
- check-requirements
|
||||
@ -114,12 +109,12 @@
|
||||
- release-notes-jobs-python3
|
||||
check:
|
||||
jobs:
|
||||
- oslo.messaging-tox-py38-func-scenario01
|
||||
- oslo.messaging-tox-py38-func-scenario02:
|
||||
- oslo.messaging-tox-py310-func-scenario01
|
||||
- oslo.messaging-tox-py310-func-scenario02:
|
||||
voting: false
|
||||
- oslo.messaging-tox-py38-func-scenario03:
|
||||
- oslo.messaging-tox-py310-func-scenario03:
|
||||
voting: false
|
||||
- oslo.messaging-tox-py38-func-scenario04:
|
||||
- oslo.messaging-tox-py310-func-scenario04:
|
||||
voting: false
|
||||
- oslo.messaging-src-dsvm-full-rabbit
|
||||
- oslo.messaging-src-dsvm-full-amqp1-hybrid:
|
||||
@ -130,8 +125,7 @@
|
||||
voting: false
|
||||
- oslo.messaging-grenade-multinode:
|
||||
voting: false
|
||||
|
||||
gate:
|
||||
jobs:
|
||||
- oslo.messaging-tox-py38-func-scenario01
|
||||
- oslo.messaging-tox-py310-func-scenario01
|
||||
- oslo.messaging-src-dsvm-full-rabbit
|
||||
|
||||
17
bindep.txt
17
bindep.txt
@ -21,22 +21,9 @@ sasl2-bin [platform:dpkg amqp1 test]
|
||||
uuid-dev [platform:dpkg amqp1 test]
|
||||
swig [platform:dpkg amqp1 test]
|
||||
libsasl2-modules [platform:dpkg amqp1 test]
|
||||
openjdk-8-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]
|
||||
default-jdk [platform:dpkg amqp1 test !platform:debian]
|
||||
|
||||
# kafka dpkg
|
||||
openjdk-8-jdk [platform:dpkg kafka]
|
||||
default-jdk [platform:dpkg kafka]
|
||||
librdkafka1 [platform:dpkg kafka]
|
||||
librdkafka-dev [platform:dpkg kafka]
|
||||
|
||||
# kafka rpm
|
||||
java-1.8.0-openjdk [platform:rpm kafka]
|
||||
librdkafka [platform:rpm kafka]
|
||||
|
||||
8
tox.ini
8
tox.ini
@ -52,7 +52,7 @@ commands =
|
||||
# scenario03 amqp rabbit
|
||||
# scenario04 amqp kafka
|
||||
#
|
||||
[testenv:py38-func-scenario01]
|
||||
[testenv:py310-func-scenario01]
|
||||
setenv =
|
||||
SCENARIO=scenario01
|
||||
allowlist_externals =
|
||||
@ -60,7 +60,7 @@ allowlist_externals =
|
||||
commands =
|
||||
{toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
|
||||
|
||||
[testenv:py38-func-scenario02]
|
||||
[testenv:py310-func-scenario02]
|
||||
setenv =
|
||||
SCENARIO=scenario02
|
||||
allowlist_externals =
|
||||
@ -68,7 +68,7 @@ allowlist_externals =
|
||||
commands =
|
||||
{toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
|
||||
|
||||
[testenv:py38-func-scenario03]
|
||||
[testenv:py310-func-scenario03]
|
||||
setenv =
|
||||
SCENARIO=scenario03
|
||||
ENVNAME={envname}
|
||||
@ -78,7 +78,7 @@ allowlist_externals =
|
||||
commands =
|
||||
{toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
|
||||
|
||||
[testenv:py38-func-scenario04]
|
||||
[testenv:py310-func-scenario04]
|
||||
setenv =
|
||||
SCENARIO=scenario04
|
||||
ENVNAME={envname}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user