diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-03-15 20:21:36 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-03-15 20:21:36 +0100 |
| commit | e418f52210a089471c6407f179776c0d2e10bc51 (patch) | |
| tree | 0a1ab4df96ecec99b838253bf439eb61073edb6a /jjb/functest/functest-kubernetes.yaml | |
| parent | 356638cd41c6c8dfb94002b45a59164e0c93cb24 (diff) | |
Fix dep image logic
Change-Id: Ia6e2c4031d6250b72d286a49ec00a3915e897d16
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/functest-kubernetes.yaml')
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 023a33f99..fd3f4c650 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -528,10 +528,10 @@ set +x if [ "_" = "_" ]; then image=alpine:{dependency} - elif [ "_" = "None" ]; then + elif [ "None" = "None" ]; then image=_/alpine:{dependency} else - image=_:/alpine{dependency} + image=_:/alpine:{dependency} fi docker pull $image || true @@ -542,10 +542,10 @@ set +x if [ "_" = "_" ]; then image=alpine:{dependency} - elif [ "_" = "None" ]; then + elif [ "" = "None" ]; then image=_/alpine:{dependency} else - image=_:/alpine{dependency} + image=_:/alpine:{dependency} fi docker rmi $image || true @@ -587,8 +587,8 @@ 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.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 |