diff options
| -rw-r--r-- | jjb/functest/functest-kubernetes-ng.yaml | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 10 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 10 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 10 |
4 files changed, 20 insertions, 13 deletions
diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml index b735e8b64..2c42fc051 100644 --- a/jjb/functest/functest-kubernetes-ng.yaml +++ b/jjb/functest/functest-kubernetes-ng.yaml @@ -300,7 +300,8 @@ name: functest-kubernetes-ng-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 diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index d090ab91b..44690adc9 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -737,10 +737,11 @@ builders: - shell: | set +x - apt-get update && apt-get install \ - software-properties-common gpg -y + apt-get update && DEBIAN_FRONTEND=noninteractive \ + apt-get install software-properties-common gpg -y add-apt-repository -y ppa:deadsnakes/ppa - apt-get update && apt-get install \ + apt-get update && 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 \ @@ -1180,7 +1181,8 @@ name: functest-kubernetes-trivy builders: - shell: | - apt-get update && apt-get install curl -y + apt-get update && DEBIAN_FRONTEND=noninteractive \ + apt-get install curl -y curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b . if [ "{repo}" = "_" ]; then diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index ba194406a..eb7d7b19d 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -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 diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index a836711cd..62d296bde 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -489,10 +489,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 \ @@ -770,7 +771,8 @@ name: xtesting-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 |