From 384b1b8800efc4cab4189f38c6b48fd8fb419a96 Mon Sep 17 00:00:00 2001 From: Ginny Guan Date: Thu, 4 Jun 2020 15:33:56 +0800 Subject: [PATCH] Update blackbox test jobs to remove mongo test fix https://github.com/edgexfoundry/ci-management/issues/610 Signed-off-by: Ginny Guan --- jjb/edgex-templates-integration.yaml | 1 - shell/integration-test-run.sh | 8 ++------ shell/integration-test-setup.sh | 3 ++- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/jjb/edgex-templates-integration.yaml b/jjb/edgex-templates-integration.yaml index f9e02ace..11847cd1 100644 --- a/jjb/edgex-templates-integration.yaml +++ b/jjb/edgex-templates-integration.yaml @@ -10,7 +10,6 @@ name: DATABASE values: - "redis" - - "mongo" - axis: type: label-expression name: node diff --git a/shell/integration-test-run.sh b/shell/integration-test-run.sh index d733a661..cc453d8d 100644 --- a/shell/integration-test-run.sh +++ b/shell/integration-test-run.sh @@ -3,15 +3,11 @@ set -e -o pipefail docker run --rm -v $PWD:$PWD:rw,z -w $PWD -v /var/run/docker.sock:/var/run/docker.sock --privileged \ --e SECURITY_SERVICE_NEEDED=$SECURITY_SERVICE_NEEDED -e DATABASE=$DATABASE --env-file $ENV_FILE \ +-e SECURITY_SERVICE_NEEDED=$SECURITY_SERVICE_NEEDED --env-file $ENV_FILE \ -e docker_compose_test_tools=$docker_compose_test_tools \ --entrypoint /bin/sh $DOCKER_COMPOSE bin/run.sh -all postman-integration-test sudo chown jenkins:jenkins bin/testResult sudo chmod g+w bin/testResult -if [ "${DATABASE:=redis}" = redis ]; then - sed -E -i "s/testsuite name=\"/testsuite name=\"redis_/" $(ls bin/testResult/*.xml) -else - sed -E -i "s/testsuite name=\"/testsuite name=\"mongo_/" $(ls bin/testResult/*.xml) -fi +sed -E -i "s/testsuite name=\"/testsuite name=\"redis_/" $(ls bin/testResult/*.xml) diff --git a/shell/integration-test-setup.sh b/shell/integration-test-setup.sh index e1f0bd1f..912c9036 100644 --- a/shell/integration-test-setup.sh +++ b/shell/integration-test-setup.sh @@ -16,6 +16,7 @@ fi export docker_compose_test_tools=$PWD/docker-compose-test-tools.yml docker run --rm -v $PWD:$PWD:rw,z -w $PWD -v /var/run/docker.sock:/var/run/docker.sock --privileged \ --e SECURITY_SERVICE_NEEDED=$SECURITY_SERVICE_NEEDED -e DATABASE=$DATABASE --env-file $ENV_FILE \ +-e SECURITY_SERVICE_NEEDED=$SECURITY_SERVICE_NEEDED --env-file $ENV_FILE \ --entrypoint /bin/sh $DOCKER_COMPOSE deploy-edgeX.sh +