From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 15 Mar 2021 19:21:36 +0000 (+0100)
Subject: Fix dep image logic
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e418f52210a089471c6407f179776c0d2e10bc51;p=releng.git

Fix dep image logic

Change-Id: Ia6e2c4031d6250b72d286a49ec00a3915e897d16
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index 5737fa79f..15dcf767c 100644
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -130,10 +130,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
           sudo docker pull $image || true
 
@@ -144,10 +144,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
           sudo docker rmi $image || true
 
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
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 30a90c5f5..f91212fed 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -743,10 +743,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
           sudo docker pull $image || true
 
@@ -757,10 +757,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
           sudo docker rmi $image || true
 
@@ -802,8 +802,8 @@
           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.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 9bb7e5752..19eb555a0 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -388,10 +388,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
           sudo docker pull $image || true
 
@@ -402,10 +402,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
           sudo docker rmi $image || true
 
@@ -447,8 +447,8 @@
           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.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