From fe601fa51b0e5887f9557dab0765b4e415b418eb Mon Sep 17 00:00:00 2001
From: Hasan Acar <hasan.acar@tubitak.gov.tr>
Date: Thu, 1 Feb 2024 20:38:15 +0000
Subject: [PATCH] fix: Upgrade librdkafka

fix: libressl3.4 packages removed

fix: publish docker image jobs added

Change-Id: Ia8fccfb28b1c95d8ffdb8ca40fba9cc586e5ce7d
---
 .zuul.yaml        |  5 +++++
 docker/Dockerfile | 10 ++++------
 setup.cfg         |  1 +
 tox.ini           | 12 ++++++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 22fb16c2..f502590f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,6 +10,7 @@
             voting: false
         - monasca-tempest-python3-cassandra
         - legacy-monasca-common-maven-build
+        - build-monasca-common-docker-base-image
     gate:
       jobs:
         - monasca-tempest-python3-influxdb:
@@ -17,7 +18,11 @@
         - legacy-monasca-common-maven-build
     post:
       jobs:
+        - publish-monasca-common-docker-base-image
         - legacy-monasca-common-localrepo-upload
+    release:
+      jobs:
+        - publish-monasca-common-docker-base-image
 
 - job:
     name: build-monasca-common-docker-base-image
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2957f232..b214a2ef 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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 ashrc /root/.ashrc
@@ -81,17 +81,15 @@ ONBUILD RUN \
                 linux-headers \
                 make \
                 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.
             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/community && \
             # Install librdkafka from source code.
             apk add --no-cache curl bash && \
-            curl https://codeload.github.com/edenhill/librdkafka/tar.gz/v1.8.0 | tar xzf - -C /tmp/ && \
-                 cd /tmp/librdkafka-1.8.0/ && \
+            curl https://codeload.github.com/edenhill/librdkafka/tar.gz/v2.3.0 | tar xzf - -C /tmp/ && \
+                 cd /tmp/librdkafka-2.3.0/ && \
                  ./configure && \
                  make && \
                  make install && \
diff --git a/setup.cfg b/setup.cfg
index 0ac51e87..f1d93fb5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.10
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 34e7bd0b..9303a72a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,8 @@
 [tox]
-envlist = py38,pep8,cover
+envlist = py310,pep8,cover
 minversion = 2.5
 skipsdist = True
+ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3
@@ -17,6 +18,9 @@ passenv = http_proxy
 whitelist_externals = bash
                       find
                       rm
+allowlist_externals = bash
+                      find
+                      rm
 install_command = pip install {opts} {packages}
 deps =
        -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
@@ -34,14 +38,14 @@ commands =
   {[testenv]commands}
   stestr run --blacklist-file {env:BLACKLIST_FILE} {posargs}
 
-[testenv:py38]
-basepython = python3.8
+[testenv:py310]
+basepython = python3.10
 setenv =
   {[testenv]setenv}
   BLACKLIST_FILE={toxinidir}/test-blacklist-py3.txt
 commands =
   {[testenv]commands}
-  stestr run --blacklist-file {env:BLACKLIST_FILE} {posargs}
+  stestr run --exclude-list {env:BLACKLIST_FILE} {posargs}
 
 [testenv:cover]
 setenv =