summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-03-13 13:11:20 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-03-13 13:13:05 +0100
commitd64dd77877536e19ff34beef53b688978f782ae7 (patch)
tree98092c7309e2e5097ae0c822855d833bfe71b028
parenta14cf5ebf3d699d6c4ad2c3233636f2660266e65 (diff)
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>
-rwxr-xr-xjjb/functest/functest-alpine.sh4
-rw-r--r--jjb/releng/functest-docker.yml7
2 files changed, 2 insertions, 9 deletions
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}'