upgrade monasca

- upgrade maven and use https repo
- temporary disable some jobs
- upgrade librdkafka

Change-Id: Ifaecf9039581cd3851b47344f71ad2c1c390484d
This commit is contained in:
Hoai-Thu Vuong 2025-01-02 14:37:07 +07:00 committed by Hoai-Thu Vuong
parent b18868e835
commit a723f69d59
5 changed files with 15 additions and 12 deletions

View File

@ -3,14 +3,17 @@
templates: templates:
- check-requirements - check-requirements
- openstack-cover-jobs - openstack-cover-jobs
- openstack-python3-zed-jobs - openstack-python3-jobs
check: check:
jobs: jobs:
- monasca-tempest-python3-influxdb: - monasca-tempest-python3-influxdb:
voting: false voting: false
- monasca-tempest-python3-cassandra - monasca-tempest-python3-cassandra:
- legacy-monasca-common-maven-build voting: false
- build-monasca-common-docker-base-image - legacy-monasca-common-maven-build:
voting: false
- build-monasca-common-docker-base-image:
voting: false
gate: gate:
jobs: jobs:
- monasca-tempest-python3-influxdb: - monasca-tempest-python3-influxdb:

View File

@ -88,8 +88,8 @@ ONBUILD RUN \
--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/v2.4.0 | tar xzf - -C /tmp/ && \ curl https://codeload.github.com/edenhill/librdkafka/tar.gz/v2.6.1 | tar xzf - -C /tmp/ && \
cd /tmp/librdkafka-2.4.0/ && \ cd /tmp/librdkafka-2.6.1/ && \
./configure && \ ./configure && \
make && \ make && \
make install && \ make install && \

View File

@ -79,7 +79,7 @@
<repositories> <repositories>
<repository> <repository>
<id>clojars.org</id> <id>clojars.org</id>
<url>http://clojars.org/repo</url> <url>https://repo.clojars.org</url>
</repository> </repository>
</repositories> </repositories>

View File

@ -38,7 +38,7 @@
<repositories> <repositories>
<repository> <repository>
<id>clojars.org</id> <id>clojars.org</id>
<url>http://clojars.org/repo</url> <url>https://repo.clojars.org</url>
</repository> </repository>
</repositories> </repositories>

View File

@ -2,9 +2,9 @@
# Download maven 3 if the system maven isn't maven 3 # Download maven 3 if the system maven isn't maven 3
VERSION=`mvn -v | grep "Apache Maven 3"` VERSION=`mvn -v | grep "Apache Maven 3"`
if [ -z "${VERSION}" ]; then if [ -z "${VERSION}" ]; then
curl http://archive.apache.org/dist/maven/binaries/apache-maven-3.2.1-bin.tar.gz > apache-maven-3.2.1-bin.tar.gz curl https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz > apache-maven-3.9.9-bin.tar.gz
tar -xvzf apache-maven-3.2.1-bin.tar.gz tar -xvzf apache-maven-3.9.9-bin.tar.gz
MVN=${PWD}/apache-maven-3.2.1/bin/mvn MVN=${PWD}/apache-maven-3.9.9/bin/mvn
else else
MVN=mvn MVN=mvn
fi fi
@ -20,5 +20,5 @@ RC=$?
mkdir -p target mkdir -p target
cp java/*/target/*.jar target cp java/*/target/*.jar target
rm -fr apache-maven-3.2.1* rm -fr apache-maven-3.9.9*
exit $RC exit $RC