Merge pull request edgexfoundry#611 from jinlinGuan/issue-610

Update blackbox test jobs to remove mongo test
anonymouse64 · Jun 23, 2020 · 9f87549 · 9f87549
2 parents 5c7b353 + 384b1b8
commit 9f87549
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
 
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ @@
                 name: DATABASE
                 values:
                     - "redis"
-                    - "mongo"
             - axis:
                 type: label-expression
                 name: node
@@ Expand Down @@