upgrade monasca
- upgrade maven and use https repo - temporary disable some jobs - upgrade librdkafka Change-Id: Ifaecf9039581cd3851b47344f71ad2c1c390484d
This commit is contained in:
parent
b18868e835
commit
a723f69d59
11
.zuul.yaml
11
.zuul.yaml
@ -3,14 +3,17 @@
|
||||
templates:
|
||||
- check-requirements
|
||||
- openstack-cover-jobs
|
||||
- openstack-python3-zed-jobs
|
||||
- openstack-python3-jobs
|
||||
check:
|
||||
jobs:
|
||||
- monasca-tempest-python3-influxdb:
|
||||
voting: false
|
||||
- monasca-tempest-python3-cassandra
|
||||
- legacy-monasca-common-maven-build
|
||||
- build-monasca-common-docker-base-image
|
||||
- monasca-tempest-python3-cassandra:
|
||||
voting: false
|
||||
- legacy-monasca-common-maven-build:
|
||||
voting: false
|
||||
- build-monasca-common-docker-base-image:
|
||||
voting: false
|
||||
gate:
|
||||
jobs:
|
||||
- monasca-tempest-python3-influxdb:
|
||||
|
@ -88,8 +88,8 @@ ONBUILD RUN \
|
||||
--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/v2.4.0 | tar xzf - -C /tmp/ && \
|
||||
cd /tmp/librdkafka-2.4.0/ && \
|
||||
curl https://codeload.github.com/edenhill/librdkafka/tar.gz/v2.6.1 | tar xzf - -C /tmp/ && \
|
||||
cd /tmp/librdkafka-2.6.1/ && \
|
||||
./configure && \
|
||||
make && \
|
||||
make install && \
|
||||
|
@ -79,7 +79,7 @@
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>clojars.org</id>
|
||||
<url>http://clojars.org/repo</url>
|
||||
<url>https://repo.clojars.org</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
|
@ -38,7 +38,7 @@
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>clojars.org</id>
|
||||
<url>http://clojars.org/repo</url>
|
||||
<url>https://repo.clojars.org</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
|
@ -2,9 +2,9 @@
|
||||
# Download maven 3 if the system maven isn't maven 3
|
||||
VERSION=`mvn -v | grep "Apache Maven 3"`
|
||||
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
|
||||
tar -xvzf apache-maven-3.2.1-bin.tar.gz
|
||||
MVN=${PWD}/apache-maven-3.2.1/bin/mvn
|
||||
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.9.9-bin.tar.gz
|
||||
MVN=${PWD}/apache-maven-3.9.9/bin/mvn
|
||||
else
|
||||
MVN=mvn
|
||||
fi
|
||||
@ -20,5 +20,5 @@ RC=$?
|
||||
mkdir -p target
|
||||
cp java/*/target/*.jar target
|
||||
|
||||
rm -fr apache-maven-3.2.1*
|
||||
rm -fr apache-maven-3.9.9*
|
||||
exit $RC
|
||||
|
Loading…
x
Reference in New Issue
Block a user