diff options
author | 2021-08-11 14:56:02 +0000 | |
---|---|---|
committer | 2021-08-11 14:56:02 +0000 | |
commit | 1c00c41d7032f9c77230abd35a415a79d4a2ad17 (patch) | |
tree | 49212cf50613bc4428310fee0f9c4f2f9a31d29b | |
parent | 364766a71ab19e94aacbd78593dcdb42e5e599d4 (diff) | |
parent | aae7c22f7d912b34257e73f4dd16441655985e72 (diff) |
Merge "Update Functest jjb due to Alpine 3.14"
-rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 7 | ||||
-rw-r--r-- | jjb/functest/functest.yaml | 7 | ||||
-rw-r--r-- | jjb/functest/xtesting.yaml | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index c49eaf042..d090ab91b 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -16,7 +16,7 @@ buildargs: branch: master slave: lf-virtual1-7 - dependency: 3.13 + dependency: 3.14 - v1.21: from: buildargs: @@ -740,8 +740,9 @@ 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 \ + apt-get update && 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 pip3 install tox tox-pip-version diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 0a4dc2aae..ba194406a 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: @@ -961,8 +961,9 @@ 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 \ + sudo apt-get update && sudo 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 diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 1d08d7c56..a836711cd 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -16,7 +16,7 @@ buildargs: branch: master slave: lf-virtual1 - dependency: 3.13 + dependency: 3.14 - wallaby: from: buildargs: @@ -492,8 +492,9 @@ 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 \ + sudo apt-get update && sudo 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 |