diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2018-06-15 10:08:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-15 10:08:45 +0000 |
| commit | 6dd3fcc928d7540c9d725b0bd8b3c72b863eb819 (patch) | |
| tree | c74411723e9bf01ad6aa72b639f95961dba35597 | |
| parent | a525952002800dfa4093f9c5d2e2ef178f91ae03 (diff) | |
| parent | b107efcbb85700b16db4c1bbb3afebf9c045ff9f (diff) | |
Merge "Remove functest-parser"
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 6 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 24a28c69f..4340a0ca0 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -69,8 +69,6 @@ run_test() { FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd|fds) FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;; - parser-basics) - FUNCTEST_IMAGE=${REPO}/functest-parser:${DOCKER_TAG} ;; *) echo "Unkown test case $test_name" exit 1 @@ -169,9 +167,9 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then run_tiers ${tiers} else if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then - tiers=(healthcheck smoke features vnf parser) + tiers=(healthcheck smoke features vnf) else - tiers=(healthcheck smoke features parser) + tiers=(healthcheck smoke features) fi run_tiers ${tiers} fi diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 50c7c3816..f7cf2d2d2 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -32,6 +32,10 @@ - 'smoke' - 'vnf' + exclude: + - stream: 'master' + image: 'parser' + # settings for jobs run in multijob phases build-job-settings: &build-job-settings current-parameters: false |