From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 13 Mar 2018 12:11:20 +0000 (+0100)
Subject: Update Functest jjobs (patrole)
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=d64dd77877536e19ff34beef53b688978f782ae7

Update Functest jjobs (patrole)

Patrole is now integrated in smoke and the dedicated container is
being removed [1]

[1] https://gerrit.opnfv.org/gerrit/#/c/53659/

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

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 541cc786c..432bbbb8b 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -177,9 +177,9 @@ if [[ ${DEPLOY_SCENARIO} =~ ^os-.* ]]; then
         run_tiers ${tiers}
     else
         if [ ${DEPLOY_TYPE} == 'baremetal' ]; then
-            tiers=(healthcheck smoke patrole features vnf parser)
+            tiers=(healthcheck smoke features vnf parser)
         else
-            tiers=(healthcheck smoke patrole features)
+            tiers=(healthcheck smoke features)
         fi
         run_tiers ${tiers}
     fi
diff --git a/jjb/releng/functest-docker.yml b/jjb/releng/functest-docker.yml
index 7c576cf00..bfeae5eaa 100644
--- a/jjb/releng/functest-docker.yml
+++ b/jjb/releng/functest-docker.yml
@@ -29,7 +29,6 @@
       - 'features'
       - 'components'
       - 'parser'
-      - 'patrole'
       - 'smoke'
       - 'vnf'
       - 'restapi'
@@ -129,10 +128,6 @@
               <<: *build-job-settings
             - name: 'functest-parser-docker-build-arm64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-patrole-docker-build-amd64-{stream}'
-              <<: *build-job-settings
-            - name: 'functest-patrole-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-smoke-docker-build-amd64-{stream}'
               <<: *build-job-settings
             - name: 'functest-smoke-docker-build-arm64-{stream}'
@@ -158,8 +153,6 @@
               <<: *manifest-job-settings
             - name: 'functest-parser-docker-manifest-{stream}'
               <<: *manifest-job-settings
-            - name: 'functest-patrole-docker-manifest-{stream}'
-              <<: *manifest-job-settings
             - name: 'functest-smoke-docker-manifest-{stream}'
               <<: *manifest-job-settings
             - name: 'functest-vnf-docker-manifest-{stream}'