From 68073cbd21ebf04f7f899668c8af9a51caeadbe2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Tue, 9 Feb 2021 19:45:57 +0100
Subject: [PATCH] Update Xtesting Hunter and Iruya gates
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: I2699ec444189eaf311bd7c2028c87a4d64e5ebd4
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/xtesting.yaml | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 3b3ffa7b9..451b87006 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -146,12 +146,7 @@
           else
             build_arg="--build-arg {ref_arg}={ref}"
           fi
-          case {tag} in
-          *latest|*leguer|*kali|*jerma)
-            cd {path};;
-          *)
-            cd docker;;
-          esac
+          cd {path};;
           sudo docker build $build_arg \
             --pull=false --no-cache --force-rm=true \
             -t $image .
@@ -185,9 +180,6 @@
     name: 'xtesting-opnfv-xtesting-mts-pull'
     <<: *xtesting-params
     container: 'xtesting-mts'
-    exclude:
-      - tag: hunter
-      - tag: iruya
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
 
@@ -211,9 +203,6 @@
     name: 'xtesting-opnfv-xtesting-mts-rmi'
     <<: *xtesting-params
     container: 'xtesting-mts'
-    exclude:
-      - tag: hunter
-      - tag: iruya
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-rmi'
 
@@ -243,9 +232,6 @@
       - sixth
     privileged: 'false'
     network: bridge
-    exclude:
-      - {'tag': 'hunter', 'test': 'sixth'}
-      - {'tag': 'iruya', 'test': 'sixth'}
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-{test}-run'
 
@@ -257,9 +243,6 @@
       - seventh
     privileged: 'false'
     network: bridge
-    exclude:
-      - {'tag': 'hunter', 'test': 'seventh'}
-      - {'tag': 'iruya', 'test': 'seventh'}
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-{test}-run'
 
@@ -472,9 +455,6 @@
     container: xtesting-mts
     ref_arg: BRANCH
     path: docker/mts
-    exclude:
-      - tag: hunter
-      - tag: iruya
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-gate'
 
@@ -610,9 +590,6 @@
     container: xtesting-mts
     ref_arg: BRANCH
     path: docker/mts
-    exclude:
-      - tag: hunter
-      - tag: iruya
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-build'
 
@@ -686,9 +663,6 @@
     name: 'xtesting-opnfv-xtesting-mts-trivy'
     <<: *xtesting-params
     container: 'xtesting-mts'
-    exclude:
-      - tag: hunter
-      - tag: iruya
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-trivy'
 
-- 
2.16.6