X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest.yaml;h=31a448cde3532477bc36581c9a24d49b2d3ddf47;hb=97e1a8c7a37e20598327fd9dd2c8d3798db2b0de;hp=ba194406aa77df18af0485232c33f63032e1627a;hpb=aae7c22f7d912b34257e73f4dd16441655985e72;p=releng.git diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index ba194406a..31a448cde 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -116,11 +116,11 @@ set +x volumes=; if [ "{volumes}" != "None" ]; then - for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done + for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done fi env=; if [ "{env}" != "None" ]; then - for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done + for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done fi [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then @@ -579,11 +579,11 @@ set +x volumes=; if [ "{volumes}" != "None" ]; then - for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done + for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done fi env=; if [ "{env}" != "None" ]; then - for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done + for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done fi [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then @@ -958,10 +958,11 @@ builders: - shell: | set +x - sudo apt-get update && sudo apt-get install \ - software-properties-common gpg -y + sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \ + apt-get install software-properties-common gpg -y sudo add-apt-repository -y ppa:deadsnakes/ppa - sudo apt-get update && sudo apt-get install \ + sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \ + apt-get install \ python3.9 python3.9-dev python3.9-distutils \ python3.8 python3.8-dev python3.8-distutils \ python3.7 python3.7-dev python3.6 python3.6-dev \ @@ -1513,7 +1514,8 @@ name: functest-trivy builders: - shell: | - sudo apt-get update && sudo apt-get install curl -y + sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \ + apt-get install curl -y curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b . if [ "{repo}" = "_" ]; then