diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2021-02-21 22:20:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2021-02-21 22:20:30 +0000 |
| commit | 14279dd573ee974e829c7e4901c3a8bdc388a58a (patch) | |
| tree | 8cdf7783bc54fa39068f167faf5efbae002c3211 | |
| parent | dd102efec7fc232f838898f24058a583af39a678 (diff) | |
| parent | f1d3ee2cb725ea01be4a43cde7ab573de2e3d97c (diff) | |
Merge "Levarge latest XtestingCI changes"
| -rw-r--r-- | jjb/functest/functest-kubernetes-ng.yaml | 1 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 5 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 5 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml index c447d5398..5737fa79f 100644 --- a/jjb/functest/functest-kubernetes-ng.yaml +++ b/jjb/functest/functest-kubernetes-ng.yaml @@ -332,6 +332,7 @@ builders: - shell: | sudo apt-get update && sudo apt-get install curl -y + curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b . if [ "{repo}" = "_" ]; then image={container}:{tag} diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index eb8b3fe3a..023a33f99 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -584,13 +584,15 @@ builders: - shell: | set +x - apt-get update && apt-get install software-properties-common gpg -y + apt-get update && apt-get install \ + software-properties-common gpg -y add-apt-repository -y ppa:deadsnakes/ppa apt-get update && apt-get install 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 pip3 install tox tox-pip-version + tox - job-template: @@ -990,6 +992,7 @@ builders: - shell: | apt-get update && apt-get install curl -y + curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b . if [ "{repo}" = "_" ]; then image={container}:{tag} diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 0c16041e2..30a90c5f5 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -799,13 +799,15 @@ builders: - shell: | set +x - sudo apt-get update && sudo apt-get install software-properties-common gpg -y + sudo apt-get update && sudo 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 \ python3.7 python3.7-dev python3.6 python3.6-dev \ python python-dev python3-pip enchant -y sudo pip3 install tox tox-pip-version + tox - job-template: @@ -1348,6 +1350,7 @@ builders: - shell: | sudo apt-get update && sudo apt-get install curl -y + curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b . if [ "{repo}" = "_" ]; then image={container}:{tag} diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 5484a59f7..9bb7e5752 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -444,13 +444,15 @@ builders: - shell: | set +x - sudo apt-get update && sudo apt-get install software-properties-common gpg -y + sudo apt-get update && sudo 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 \ python3.7 python3.7-dev python3.6 python3.6-dev \ python python-dev python3-pip enchant -y sudo pip3 install tox tox-pip-version + tox - job-template: @@ -719,6 +721,7 @@ builders: - shell: | sudo apt-get update && sudo apt-get install curl -y + curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b . if [ "{repo}" = "_" ]; then image={container}:{tag} |