diff options
Diffstat (limited to 'jjb/functest/functest.yaml')
| -rw-r--r-- | jjb/functest/functest.yaml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 0a4dc2aae..31a448cde 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -17,7 +17,7 @@ branch: master slave: lf-pod4-2 DASHBOARD_URL: http://172.30.12.85 - dependency: 3.13 + dependency: 3.14 - wallaby: from: buildargs: @@ -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,11 +958,13 @@ 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 python3.8 \ - python3.8-dev python3.8-distutils \ + 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 \ python python-dev python3-pip enchant -y sudo pip3 install tox tox-pip-version @@ -1512,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 |