From: Martin Klozik Date: Wed, 4 Sep 2019 08:24:25 +0000 (+0200) Subject: POLICY: update of apache-maven repo URL X-Git-Tag: 6.0.0-ONAP~144^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f5ae348b6e7d5c5d4612ff6dc7a33bbeddfb4362;p=integration%2Fcsit.git POLICY: update of apache-maven repo URL Allow automatic selection of the best apache mirror server to avoid hardcoded mirror server in apache-maven download url. This change should increase reliability of POLICY CSIT test plans in case that some mirror servers are experiencing issues. Originally used server is set as preferred, i.e. it still will be used if it's available. In case of failure of maven installation, test plan execution will be terminated with failure. Change-Id: Ia765652b42e6a20716f5e76304916602852b5654 Issue-ID: POLICY-2046 Signed-off-by: Martin Klozik --- diff --git a/plans/policy/apex-pdp/setup.sh b/plans/policy/apex-pdp/setup.sh index 22e813df..16621241 100644 --- a/plans/policy/apex-pdp/setup.sh +++ b/plans/policy/apex-pdp/setup.sh @@ -49,8 +49,12 @@ fi # bring down maven mkdir maven cd maven -curl -O http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz -tar -xzvf apache-maven-3.3.9-bin.tar.gz +# download maven from automatically selected mirror server +curl -vLO "https://www.apache.org/dyn/mirrors/mirrors.cgi?cca2=us&preferred=http://apache.claz.org/&action=download&filename=maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz" +if ! tar -xzvf apache-maven-3.3.9-bin.tar.gz ; then + echo "Installation of maven has failed!" + exit 1 +fi ls -l export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v diff --git a/plans/policy/distribution/setup.sh b/plans/policy/distribution/setup.sh index 399df0e6..18cb88ed 100644 --- a/plans/policy/distribution/setup.sh +++ b/plans/policy/distribution/setup.sh @@ -50,8 +50,12 @@ fi # bring down maven mkdir maven cd maven -curl -O http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz -tar -xzvf apache-maven-3.3.9-bin.tar.gz +# download maven from automatically selected mirror server +curl -vLO "https://www.apache.org/dyn/mirrors/mirrors.cgi?cca2=us&preferred=http://apache.claz.org/&action=download&filename=maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz" +if ! tar -xzvf apache-maven-3.3.9-bin.tar.gz ; then + echo "Installation of maven has failed!" + exit 1 +fi ls -l export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v diff --git a/plans/policy/xacml-pdp/setup.sh b/plans/policy/xacml-pdp/setup.sh index 1d4325bd..9a2e92fe 100644 --- a/plans/policy/xacml-pdp/setup.sh +++ b/plans/policy/xacml-pdp/setup.sh @@ -47,8 +47,12 @@ fi # bring down maven mkdir maven cd maven -curl -O http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz -tar -xzvf apache-maven-3.3.9-bin.tar.gz +# download maven from automatically selected mirror server +curl -vLO "https://www.apache.org/dyn/mirrors/mirrors.cgi?cca2=us&preferred=http://apache.claz.org/&action=download&filename=maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz" +if ! tar -xzvf apache-maven-3.3.9-bin.tar.gz ; then + echo "Installation of maven has failed!" + exit 1 +fi ls -l export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v diff --git a/scripts/policy/drools-pdp-script.sh b/scripts/policy/drools-pdp-script.sh index fc8556ff..6e14931f 100755 --- a/scripts/policy/drools-pdp-script.sh +++ b/scripts/policy/drools-pdp-script.sh @@ -37,8 +37,12 @@ fi # bring down maven mkdir maven cd maven -curl -O http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz -tar -xzvf apache-maven-3.3.9-bin.tar.gz +# download maven from automatically selected mirror server +curl -vLO "https://www.apache.org/dyn/mirrors/mirrors.cgi?cca2=us&preferred=http://apache.claz.org/&action=download&filename=maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz" +if ! tar -xzvf apache-maven-3.3.9-bin.tar.gz ; then + echo "Installation of maven has failed!" + exit 1 +fi ls -l export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v diff --git a/scripts/policy/engine.sh b/scripts/policy/engine.sh index ef02be5a..3e9f3d42 100755 --- a/scripts/policy/engine.sh +++ b/scripts/policy/engine.sh @@ -37,8 +37,12 @@ fi # bring down maven mkdir maven cd maven -curl -O http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz -tar -xzvf apache-maven-3.3.9-bin.tar.gz +# download maven from automatically selected mirror server +curl -vLO "https://www.apache.org/dyn/mirrors/mirrors.cgi?cca2=us&preferred=http://apache.claz.org/&action=download&filename=maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz" +if ! tar -xzvf apache-maven-3.3.9-bin.tar.gz ; then + echo "Installation of maven has failed!" + exit 1 +fi ls -l export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v