From 17e441378cd3e0609ca05a3e01790acac7a5464a Mon Sep 17 00:00:00 2001 From: YanzhaoLi Date: Mon, 9 Sep 2019 02:14:49 -0700 Subject: [PATCH] Downgrade mongo version to 3 for centos6.9 --- .../Group1-Docker-Commands/1-04-Docker-Create.robot | 2 +- tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.robot | 2 +- tests/test-cases/Group22-Docker-Apps/22-05-mongo.robot | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot b/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot index f49521c48e..d149def806 100644 --- a/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot +++ b/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot @@ -98,7 +98,7 @@ Create with complex volume topology - overriding image volume with named volume ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} volume create --name ${namedImageVol} Should Be Equal As Integers ${rc} 0 Set Test Variable ${imageVolumeContainer} I-Have-Two-Anonymous-Volumes-${suffix} - ${rc} ${c5}= Run And Return Rc And Output docker %{VCH-PARAMS} create --name ${imageVolumeContainer} -v ${namedImageVol}:/data/db -v /I/AM/ANONYMOOOOSE mongo + ${rc} ${c5}= Run And Return Rc And Output docker %{VCH-PARAMS} create --name ${imageVolumeContainer} -v ${namedImageVol}:/data/db -v /I/AM/ANONYMOOOOSE mongo:3 Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} inspect -f "{{.HostConfig.Binds}}" ${imageVolumeContainer} Should Contain ${output} ${namedImageVol} diff --git a/tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.robot b/tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.robot index 7b8c0d2543..df53c215c0 100644 --- a/tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.robot +++ b/tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.robot @@ -180,7 +180,7 @@ Docker run and auto remove with anonymous volumes and named volumes Set Test Variable ${namedImageVol} non-anonymous-image-volume-${suffix} Should Be Equal As Integers ${rc} 0 Set Test Variable ${imageVolumeContainer} I-Have-Two-Anonymous-Volumes-${suffix} - ${rc} ${c5}= Run And Return Rc And Output docker %{VCH-PARAMS} run --rm --name ${imageVolumeContainer} -v ${namedImageVol}:/data/db -v /I/AM/ANONYMOOOOSE mongo bash + ${rc} ${c5}= Run And Return Rc And Output docker %{VCH-PARAMS} run --rm --name ${imageVolumeContainer} -v ${namedImageVol}:/data/db -v /I/AM/ANONYMOOOOSE mongo:3 bash Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} ps -a Should Be Equal As Integers ${rc} 0 diff --git a/tests/test-cases/Group22-Docker-Apps/22-05-mongo.robot b/tests/test-cases/Group22-Docker-Apps/22-05-mongo.robot index e6a79b3108..395190ac13 100644 --- a/tests/test-cases/Group22-Docker-Apps/22-05-mongo.robot +++ b/tests/test-cases/Group22-Docker-Apps/22-05-mongo.robot @@ -21,7 +21,7 @@ Suite Teardown Cleanup VIC Appliance On Test Server *** Keywords *** Check mongo container [Arguments] ${ip} - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run --rm mongo sh -c 'mongo "${ip}/27017" --quiet --eval "db.adminCommand( { listDatabases: 1 } )"' + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run --rm mongo:3 sh -c 'mongo "${ip}/27017" --quiet --eval "db.adminCommand( { listDatabases: 1 } )"' Log ${output} Should Be Equal As Integers ${rc} 0 Should Contain ${output} "name" : "admin" @@ -29,7 +29,7 @@ Check mongo container *** Test Cases *** Simple background mongo - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run --name mongo1 -d mongo + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run --name mongo1 -d mongo:3 Log ${output} Should Be Equal As Integers ${rc} 0 ${ip}= Get IP Address of Container mongo1