Update test case exclusions

[releng.git] / jjb / functest / functest-kubernetes-ng.yaml

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index 5737fa7..ae84749 100644 (file)
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -29,36 +29,6 @@
           dependency: 3.11
           buildargs: --build-arg K8S_TAG=1.18
           from: s/:kali$/:v1.18/g
-      - v1.17:
-          buildargs:
-          branch: stable/jerma
-          slave: lf-virtual1
-          dependency: 3.10
-          from: s/:jerma$/:v1.17/g
-      - v1.16:
-          branch: stable/jerma
-          slave: lf-virtual1
-          dependency: 3.10
-          buildargs: --build-arg K8S_TAG=1.16
-          from: s/:jerma$/:v1.16/g
-      - v1.15:
-          buildargs:
-          branch: stable/iruya
-          slave: lf-virtual1
-          dependency: 3.9
-          from: s/:iruya$/:v1.15/g
-      - v1.14:
-          branch: stable/iruya
-          slave: lf-virtual1
-          dependency: 3.9
-          buildargs: --build-arg K8S_TAG=1.14
-          from: s/:iruya$/:v1.14/g
-      - v1.13:
-          buildargs:
-          branch: stable/hunter
-          slave: lf-virtual1
-          dependency: 3.9
-          from: s/:hunter$/:v1.13/g
 
 - functest-kubernetes-ng-jobs: &functest-kubernetes-ng-jobs
     name: 'functest-kubernetes-ng-jobs'
@@ -130,10 +100,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 +114,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