fix: Upgrade librdkafka

fix: libressl3.4 packages removed

fix: publish docker image jobs added

Change-Id: Ia8fccfb28b1c95d8ffdb8ca40fba9cc586e5ce7d
This commit is contained in:
Hasan Acar 2024-02-01 20:38:15 +00:00
parent cdc03f9ae5
commit fe601fa51b
4 changed files with 18 additions and 10 deletions

View File

@ -10,6 +10,7 @@
voting: false voting: false
- monasca-tempest-python3-cassandra - monasca-tempest-python3-cassandra
- legacy-monasca-common-maven-build - legacy-monasca-common-maven-build
- build-monasca-common-docker-base-image
gate: gate:
jobs: jobs:
- monasca-tempest-python3-influxdb: - monasca-tempest-python3-influxdb:
@ -17,7 +18,11 @@
- legacy-monasca-common-maven-build - legacy-monasca-common-maven-build
post: post:
jobs: jobs:
- publish-monasca-common-docker-base-image
- legacy-monasca-common-localrepo-upload - legacy-monasca-common-localrepo-upload
release:
jobs:
- publish-monasca-common-docker-base-image
- job: - job:
name: build-monasca-common-docker-base-image name: build-monasca-common-docker-base-image

View File

@ -1,4 +1,4 @@
FROM python:3.8-alpine3.15 FROM python:3.10-alpine3.19
COPY wait_for.sh kafka_wait_for_topics.py mysql_check.py / COPY wait_for.sh kafka_wait_for_topics.py mysql_check.py /
COPY ashrc /root/.ashrc COPY ashrc /root/.ashrc
@ -81,17 +81,15 @@ ONBUILD RUN \
linux-headers \ linux-headers \
make \ make \
rust && \ rust && \
# For librdkafka bigger than v1.8.0 we need newer versions of some # For librdkafka bigger than v2.3.0 we need newer versions of some
# libraries. # libraries.
apk add --no-cache --virtual .build-librdkafka \ apk add --no-cache --virtual .build-librdkafka \
libressl3.4-libcrypto \
libressl3.4-libssl \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \ --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/community && \ --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community && \
# Install librdkafka from source code. # Install librdkafka from source code.
apk add --no-cache curl bash && \ apk add --no-cache curl bash && \
curl https://codeload.github.com/edenhill/librdkafka/tar.gz/v1.8.0 | tar xzf - -C /tmp/ && \ curl https://codeload.github.com/edenhill/librdkafka/tar.gz/v2.3.0 | tar xzf - -C /tmp/ && \
cd /tmp/librdkafka-1.8.0/ && \ cd /tmp/librdkafka-2.3.0/ && \
./configure && \ ./configure && \
make && \ make && \
make install && \ make install && \

View File

@ -19,6 +19,7 @@ classifier =
Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.10
[files] [files]
packages = packages =

12
tox.ini
View File

@ -1,7 +1,8 @@
[tox] [tox]
envlist = py38,pep8,cover envlist = py310,pep8,cover
minversion = 2.5 minversion = 2.5
skipsdist = True skipsdist = True
ignore_basepython_conflict = True
[testenv] [testenv]
basepython = python3 basepython = python3
@ -17,6 +18,9 @@ passenv = http_proxy
whitelist_externals = bash whitelist_externals = bash
find find
rm rm
allowlist_externals = bash
find
rm
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
@ -34,14 +38,14 @@ commands =
{[testenv]commands} {[testenv]commands}
stestr run --blacklist-file {env:BLACKLIST_FILE} {posargs} stestr run --blacklist-file {env:BLACKLIST_FILE} {posargs}
[testenv:py38] [testenv:py310]
basepython = python3.8 basepython = python3.10
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
BLACKLIST_FILE={toxinidir}/test-blacklist-py3.txt BLACKLIST_FILE={toxinidir}/test-blacklist-py3.txt
commands = commands =
{[testenv]commands} {[testenv]commands}
stestr run --blacklist-file {env:BLACKLIST_FILE} {posargs} stestr run --exclude-list {env:BLACKLIST_FILE} {posargs}
[testenv:cover] [testenv:cover]
setenv = setenv =