diff --git a/.zuul.yaml b/.zuul.yaml index 2d53527a..1f9010c1 100644 --- a/.zuul.yaml +++ b/.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: diff --git a/docker/Dockerfile b/docker/Dockerfile index 808ce257..17bad2f6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 && \ diff --git a/java/monasca-common-middleware/pom.xml b/java/monasca-common-middleware/pom.xml index 12e10748..3595a0ca 100644 --- a/java/monasca-common-middleware/pom.xml +++ b/java/monasca-common-middleware/pom.xml @@ -79,7 +79,7 @@ clojars.org - http://clojars.org/repo + https://repo.clojars.org diff --git a/java/monasca-common-streaming/pom.xml b/java/monasca-common-streaming/pom.xml index cfe80295..599bbeb8 100644 --- a/java/monasca-common-streaming/pom.xml +++ b/java/monasca-common-streaming/pom.xml @@ -38,7 +38,7 @@ clojars.org - http://clojars.org/repo + https://repo.clojars.org diff --git a/run_maven.sh b/run_maven.sh index f5bf3b32..373e90ce 100755 --- a/run_maven.sh +++ b/run_maven.sh @@ -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